Fix DESTDIR + ETCDIR interaction.

--HG--
extra : convert_revision : xtraeme%40gmail.com-20090818140434-3wttn8uvc7on7mry
This commit is contained in:
Juan RP 2009-08-18 16:04:34 +02:00
parent ca9d72d460
commit 876529370d
2 changed files with 5 additions and 5 deletions

View File

@ -9,10 +9,10 @@ all:
clean: clean:
install: install:
if [ ! -d $(ETCDIR) ]; then \ if [ ! -d $(DESTDIR)$(ETCDIR) ]; then \
install -d $(ETCDIR); \ install -d $(DESTDIR)$(ETCDIR); \
fi fi
if [ ! -f $(ETCDIR)/$(CONF_FILE) ]; then \ if [ ! -f $(DESTDIR)$(ETCDIR)/$(CONF_FILE) ]; then \
install -m 644 $(CONF_FILE) $(ETCDIR); \ install -m 644 $(CONF_FILE) $(DESTDIR)$(ETCDIR); \
fi fi

View File

@ -3,7 +3,7 @@
PREFIX ?= /usr/local PREFIX ?= /usr/local
SBINDIR ?= $(DESTDIR)$(PREFIX)/sbin SBINDIR ?= $(DESTDIR)$(PREFIX)/sbin
LIBDIR ?= $(DESTDIR)$(PREFIX)/lib LIBDIR ?= $(DESTDIR)$(PREFIX)/lib
ETCDIR ?= $(DESTDIR)$(PREFIX)/etc ETCDIR ?= $(PREFIX)/etc
TOPDIR ?= .. TOPDIR ?= ..
INSTALL_STRIPPED ?= -s INSTALL_STRIPPED ?= -s