Author: twittner Date: Mon Mar 27 17:47:50 2006 GMT Module: SOURCES Tag: HEAD ---- Log message: - fixes for `make install'
---- Files affected: SOURCES: emacs-erc-DESTDIR.patch (NONE -> 1.1) (NEW), emacs-erc-install-info.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/emacs-erc-DESTDIR.patch diff -u /dev/null SOURCES/emacs-erc-DESTDIR.patch:1.1 --- /dev/null Mon Mar 27 19:47:50 2006 +++ SOURCES/emacs-erc-DESTDIR.patch Mon Mar 27 19:47:45 2006 @@ -0,0 +1,21 @@ +--- erc-5.1.2/Makefile~ 2006-02-20 05:38:05.000000000 +0100 ++++ erc-5.1.2/Makefile 2006-03-27 19:12:20.000000000 +0200 +@@ -66,13 +66,13 @@ + -rm -f $(MANUAL).info $(MANUAL).html $(TARGET) $(SPECIAL) + + install-info: $(MANUAL).info +- [ -d $(INFODIR) ] || install -d $(INFODIR) +- install -m 0644 $(MANUAL).info $(INFODIR)/$(MANUAL) +- $(INSTALLINFO) $(INFODIR)/$(MANUAL) ++ [ -d $(DESTDIR)$(INFODIR) ] || install -d $(DESTDIR)$(INFODIR) ++ install -m 0644 $(MANUAL).info $(DESTDIR)$(INFODIR)/$(MANUAL) ++ $(INSTALLINFO) $(DESTDIR)$(INFODIR)/$(MANUAL) + + install-bin: lisp +- install -d $(ELISPDIR) +- install -m 0644 $(ALLSOURCE) $(TARGET) $(ELISPDIR) ++ install -d $(DESTDIR)$(ELISPDIR) ++ install -m 0644 $(ALLSOURCE) $(TARGET) $(DESTDIR)$(ELISPDIR) + + install: install-bin install-info + ================================================================ Index: SOURCES/emacs-erc-install-info.patch diff -u /dev/null SOURCES/emacs-erc-install-info.patch:1.1 --- /dev/null Mon Mar 27 19:47:50 2006 +++ SOURCES/emacs-erc-install-info.patch Mon Mar 27 19:47:45 2006 @@ -0,0 +1,22 @@ +--- erc-5.1.2/Makefile~ 2006-03-27 19:32:49.000000000 +0200 ++++ erc-5.1.2/Makefile 2006-03-27 19:35:32.000000000 +0200 +@@ -26,7 +26,7 @@ + #EMACS = xemacs + #SITEFLAG = -no-site-file + +-INSTALLINFO = install-info --info-dir=$(INFODIR) ++INSTALLINFO = /usr/sbin/install-info --info-dir=$(INFODIR) + + # If you're using Debian, uncomment the following line and comment out + #the above line. +@@ -67,8 +67,8 @@ + + install-info: $(MANUAL).info + [ -d $(DESTDIR)$(INFODIR) ] || install -d $(DESTDIR)$(INFODIR) +- install -m 0644 $(MANUAL).info $(DESTDIR)$(INFODIR)/$(MANUAL) +- $(INSTALLINFO) $(DESTDIR)$(INFODIR)/$(MANUAL) ++ install -m 0644 $(MANUAL).info $(DESTDIR)$(INFODIR) ++# $(INSTALLINFO) $(DESTDIR)$(INFODIR)/$(MANUAL) + + install-bin: lisp + install -d $(DESTDIR)$(ELISPDIR) ================================================================ _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
