--- Makefile.orig 2014-07-02 11:22:29.181567830 +0800 +++ Makefile 2014-07-02 11:24:31.679559320 +0800 @@ -17,7 +17,7 @@ SCRIPTS=scripts/ion-edit scripts/ion-man ETC= etc/bindings-default.conf etc/bindings-sun.conf etc/kludges.conf \ etc/look-brownsteel.conf etc/look-greyviolet.conf \ - etc/look-simpleblue.conf etc/look-wheat.conf etc/sample.conf + etc/look-simpleblue.conf etc/look-wheat.conf DOCS= README LICENSE ChangeLog doc/config.txt doc/functions.txt @@ -31,34 +31,22 @@ man/ion.1x: man/ion.1x.in sed 's#PREFIX#$(PREFIX)#g' man/ion.1x.in > man/ion.1x _install: - $(INSTALLDIR) $(BINDIR) + $(INSTALLDIR) $(DESTDIR)$(BINDIR) for i in $(SCRIPTS); do \ - $(INSTALL) -m $(BIN_MODE) $$i $(BINDIR); \ + $(INSTALL) -m $(BIN_MODE) $$i $(DESTDIR)$(BINDIR); \ done - $(INSTALLDIR) $(MANDIR)/man1 - $(INSTALL) -m $(DATA_MODE) man/ion.1x $(MANDIR)/man1 + $(INSTALLDIR) $(DESTDIR)$(MANDIR)/man1 + $(INSTALL) -m $(DATA_MODE) man/ion.1x $(DESTDIR)$(MANDIR)/man1 - $(INSTALLDIR) $(DOCDIR)/ion + $(INSTALLDIR) $(DESTDIR)$(DOCDIR)/ion for i in $(DOCS); do \ - $(INSTALL) -m $(DATA_MODE) $$i $(DOCDIR)/ion; \ + $(INSTALL) -m $(DATA_MODE) $$i $(DESTDIR)$(DOCDIR)/ion; \ done - $(INSTALLDIR) $(ETCDIR)/ion + $(INSTALLDIR) $(DESTDIR)$(ETCDIR)/ion for i in $(ETC); do \ - $(INSTALL) -m $(DATA_MODE) $$i $(ETCDIR)/ion; \ + $(INSTALL) -m $(DATA_MODE) $$i $(DESTDIR)$(ETCDIR)/ion; \ done - - @ if test -f $(ETCDIR)/ion/ion.conf ; then \ - echo "$(ETCDIR)/ion/ion.conf already exists. Not installing one."; \ - else \ - echo "Installing configuration file $(ETCDIR)/ion/ion.conf"; \ - if uname -s -p|grep "SunOS sparc" > /dev/null; then \ - sed s/bindings-default/bindings-sun/ \ - $(ETCDIR)/ion/sample.conf > $(ETCDIR)/ion/ion.conf; \ - chmod $(DATA_MODE) $(ETCDIR)/ion/ion.conf; \ - else \ - cp $(ETCDIR)/ion/sample.conf $(ETCDIR)/ion/ion.conf; \ - fi; \ - fi + $(INSTALL) -m $(DATA_MODE) etc/sample.conf $(DESTDIR)$(ETCDIR)/ion/ion.conf.sample;