SOURCES: nmh-DESTDIR.patch - updated for 1.2
darekr
darekr at pld-linux.org
Thu Jan 12 12:27:41 CET 2006
Author: darekr Date: Thu Jan 12 11:27:41 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 1.2
---- Files affected:
SOURCES:
nmh-DESTDIR.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/nmh-DESTDIR.patch
diff -u SOURCES/nmh-DESTDIR.patch:1.1 SOURCES/nmh-DESTDIR.patch:1.2
--- SOURCES/nmh-DESTDIR.patch:1.1 Mon Jul 25 16:31:50 2005
+++ SOURCES/nmh-DESTDIR.patch Thu Jan 12 12:27:36 2006
@@ -1,80 +1,23 @@
-diff -uNr nmh.orig/etc/Makefile.in nmh/etc/Makefile.in
---- nmh.orig/etc/Makefile.in 2003-10-24 22:17:19.000000000 +0200
-+++ nmh/etc/Makefile.in 2005-03-22 20:21:20.983174360 +0100
-@@ -72,24 +72,24 @@
+--- nmh-1.2.orig/etc/Makefile.in 2006-01-12 11:19:12.000000000 +0100
++++ nmh-1.2/etc/Makefile.in 2006-01-12 12:12:14.000000000 +0100
+@@ -72,13 +72,13 @@
rm -f $@
$(SED) -e 's,%mts%,$(MTS),' \
-e 's,%mailspool%,$(mailspool),' \
- -e 's,%etcdir%,$(etcdir),' \
-+ -e 's,%etcdir%,$(DESTDIR)/$(etcdir),' \
++ -e 's,%etcdir%,$(DESTDIR)$(etcdir),' \
-e 's,%masquerade%,$(masquerade),' \
-e 's,%smtpservers%,$(smtpservers),' < $(srcdir)/mts.conf.in > $@
sendfiles: $(srcdir)/sendfiles.in Makefile
rm -f $@
- $(SED) -e 's,%libdir%,$(libdir),' < $(srcdir)/sendfiles.in > $@
-+ $(SED) -e 's,%libdir%,$(DESTDIR)/$(libdir),' < $(srcdir)/sendfiles.in > $@
++ $(SED) -e 's,%libdir%,$(DESTDIR)$(libdir),' < $(srcdir)/sendfiles.in > $@
install: install-bin-files install-etc-files
- install-bin-files:
-- $(top_srcdir)/mkinstalldirs $(bindir)
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(bindir)
- for script in $(GENERATED_BIN_FILES); do \
-- $(INSTALL_PROGRAM) $$script $(bindir)/$$script; \
-+ $(INSTALL_PROGRAM) $$script $(DESTDIR)/$(bindir)/$$script; \
- done
-
- install-etc-files:
-- $(top_srcdir)/mkinstalldirs $(etcdir)
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(etcdir)
- INSTALL_FILES="$(GENERATED_ETC_FILES)"; \
- for file in $(STATIC_FILES); do \
- INSTALL_FILES="$$INSTALL_FILES $(srcdir)/$$file"; \
-@@ -97,11 +97,11 @@
- for path in $$INSTALL_FILES; do \
- file=`basename $$path`; \
- echo "Installing $$file..."; \
-- if [ -f $(etcdir)/$$file ]; then \
-- mv $(etcdir)/$$file $(etcdir)/$$file.prev; \
-- $(INSTALL_DATA) $$path $(etcdir)/$$file; \
-- if diff $(etcdir)/$$file.prev $(etcdir)/$$file; then \
-- rm $(etcdir)/$$file.prev; \
-+ if [ -f $(DESTDIR)/$(etcdir)/$$file ]; then \
-+ mv $(DESTDIR)/$(etcdir)/$$file $(DESTDIR)/$(etcdir)/$$file.prev; \
-+ $(INSTALL_DATA) $$path $(DESTDIR)/$(etcdir)/$$file; \
-+ if diff $(DESTDIR)/$(etcdir)/$$file.prev $(DESTDIR)/$(etcdir)/$$file; then \
-+ rm $(DESTDIR)/$(etcdir)/$$file.prev; \
- else \
- echo; \
- echo " Previous version of $$file saved as $$file.prev due\c";\
-@@ -111,7 +111,7 @@
- echo; \
- fi; \
- else \
-- $(INSTALL_DATA) $$path $(etcdir)/$$file; \
-+ $(INSTALL_DATA) $$path $(DESTDIR)/$(etcdir)/$$file; \
- fi; \
- done
-
-@@ -119,12 +119,12 @@
-
- uninstall-bin-files:
- for script in $(GENERATED_BIN_FILES); do \
-- rm -f $(bindir)/$$script; \
-+ rm -f $(DESTDIR)/$(bindir)/$$script; \
- done
-
- uninstall-etc-files:
- for file in $(STATIC_FILES) $(GENERATED_ETC_FILES); do \
-- rm -f $(etcdir)/$$file; \
-+ rm -f $(DESTDIR)/$(etcdir)/$$file; \
- done
-
- # ========== DEPENDENCIES FOR CLEANUP ==========
-diff -uNr nmh.orig/man/Makefile.in nmh/man/Makefile.in
---- nmh.orig/man/Makefile.in 2003-10-24 22:17:36.000000000 +0200
-+++ nmh/man/Makefile.in 2005-03-22 20:21:48.037061544 +0100
+--- nmh-1.2.orig/man/Makefile.in 2006-01-12 11:19:12.000000000 +0100
++++ nmh-1.2/man/Makefile.in 2006-01-12 12:14:33.000000000 +0100
@@ -50,7 +50,7 @@
.man.$(manext8):
$(SEDMAN)
@@ -89,146 +32,12 @@
echo 's,%nmhversion%,nmh-$(VERSION),g' >> $@
echo 's,%nmhdate%,$(DATE),g' >> $@
- echo 's,%bindir%,$(bindir),g' >> $@
-+ echo 's,%bindir%,$(DESTDIR)/$(bindir),g' >> $@
++ echo 's,%bindir%,$(DESTDIR)$(bindir),g' >> $@
echo 's,%etcdir%,$(etcdir),g' >> $@
- echo 's,%libdir%,$(libdir),g' >> $@
- echo 's,%mandir%,$(mandir),g' >> $@
-+ echo 's,%libdir%,$(DESTDIR)/$(libdir),g' >> $@
-+ echo 's,%mandir%,$(DESTDIR)/$(mandir),g' >> $@
++ echo 's,%libdir%,$(DESTDIR)$(libdir),g' >> $@
++ echo 's,%mandir%,$(DESTDIR)$(mandir),g' >> $@
echo 's,%mailspool%,$(mailspool),g' >> $@
echo 's,%sendmailpath%,$(sendmailpath),g' >> $@
echo 's,%default_editor%,$(default_editor),g' >> $@
-@@ -130,27 +130,27 @@
-
- # install the man pages in man1
- install-man1:
-- $(top_srcdir)/mkinstalldirs $(mandir)/man$(manext1)
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(mandir)/man$(manext1)
- for file in $(MAN1); do \
-- $(INSTALL_DATA) $$file $(mandir)/man$(manext1) ; \
-+ $(INSTALL_DATA) $$file $(DESTDIR)/$(mandir)/man$(manext1) ; \
- done
-
- # install the man pages in man5
- install-man5:
-- $(top_srcdir)/mkinstalldirs $(mandir)/man$(manext5)
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(mandir)/man$(manext5)
- for file in $(MAN5); do \
-- $(INSTALL_DATA) $$file $(mandir)/man$(manext5) ; \
-+ $(INSTALL_DATA) $$file $(DESTDIR)/$(mandir)/man$(manext5) ; \
- done
-- if [ ! -f $(mandir)/man$(manext5)/mh_profile.$(manext5) ] ; then \
-- ( cd $(mandir)/man$(manext5) ; ln mh-profile.$(manext5) \
-+ if [ ! -f $(DESTDIR)/$(mandir)/man$(manext5)/mh_profile.$(manext5) ] ; then \
-+ ( cd $(DESTDIR)/$(mandir)/man$(manext5) ; ln mh-profile.$(manext5) \
- mh_profile.$(manext5) ) \
- fi
-
- # install the man pages in man8
- install-man8:
-- $(top_srcdir)/mkinstalldirs $(mandir)/man$(manext8)
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(mandir)/man$(manext8)
- for file in $(MAN8); do \
-- $(INSTALL_DATA) $$file $(mandir)/man$(manext8) ; \
-+ $(INSTALL_DATA) $$file $(DESTDIR)/$(mandir)/man$(manext8) ; \
- done
-
- # ========= UNINSTALL TARGETS =========
-@@ -160,19 +160,19 @@
- # uninstall the man pages in man1
- uninstall-man1:
- for file in $(MAN1); do \
-- rm -f $(mandir)/man$(manext1)/$$file; \
-+ rm -f $(DESTDIR)/$(mandir)/man$(manext1)/$$file; \
- done
-
- # uninstall the man pages in man5
- uninstall-man5:
- for file in $(MAN5); do \
-- rm -f $(mandir)/man$(manext5)/$$file; \
-+ rm -f $(DESTDIR)/$(mandir)/man$(manext5)/$$file; \
- done
-
- # uninstall the man pages in man8
- uninstall-man8:
- for file in $(MAN8); do \
-- rm -f $(mandir)/man$(manext8)/$$file; \
-+ rm -f $(DESTDIR)/$(mandir)/man$(manext8)/$$file; \
- done
-
- # ========== DEPENDENCIES FOR CLEANUP ==========
-diff -uNr nmh.orig/uip/Makefile.in nmh/uip/Makefile.in
---- nmh.orig/uip/Makefile.in 2003-10-24 22:17:38.000000000 +0200
-+++ nmh/uip/Makefile.in 2005-03-22 20:21:20.985174056 +0100
-@@ -255,51 +255,51 @@
-
- # install commands
- install-cmds:
-- $(top_srcdir)/mkinstalldirs $(bindir)
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(bindir)
- for cmd in $(CMDS); do \
-- $(INSTALL_PROGRAM) $$cmd $(bindir)/$$cmd; \
-+ $(INSTALL_PROGRAM) $$cmd $(DESTDIR)/$(bindir)/$$cmd; \
- done
-
- # install links
- install-lcmds:
-- rm -f $(bindir)/flists
-- rm -f $(bindir)/folders
-- rm -f $(bindir)/prev
-- rm -f $(bindir)/next
-- rm -f $(libdir)/install-mh
-- $(LN) $(bindir)/flist $(bindir)/flists
-- $(LN) $(bindir)/folder $(bindir)/folders
-- $(LN) $(bindir)/show $(bindir)/prev
-- $(LN) $(bindir)/show $(bindir)/next
-- $(LN) $(bindir)/install-mh $(libdir)/install-mh
-+ rm -f $(DESTDIR)/$(bindir)/flists
-+ rm -f $(DESTDIR)/$(bindir)/folders
-+ rm -f $(DESTDIR)/$(bindir)/prev
-+ rm -f $(DESTDIR)/$(bindir)/next
-+ rm -f $(DESTDIR)/$(libdir)/install-mh
-+ $(LN) $(DESTDIR)/$(bindir)/flist $(DESTDIR)/$(bindir)/flists
-+ $(LN) $(DESTDIR)/$(bindir)/folder $(DESTDIR)/$(bindir)/folders
-+ $(LN) $(DESTDIR)/$(bindir)/show $(DESTDIR)/$(bindir)/prev
-+ $(LN) $(DESTDIR)/$(bindir)/show $(DESTDIR)/$(bindir)/next
-+ $(LN) $(DESTDIR)/$(bindir)/install-mh $(DESTDIR)/$(libdir)/install-mh
-
- # install misc support binaries
- install-misc:
-- $(top_srcdir)/mkinstalldirs $(libdir)
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(libdir)
- for misc in $(MISC); do \
-- $(INSTALL_PROGRAM) $$misc $(libdir)/$$misc; \
-+ $(INSTALL_PROGRAM) $$misc $(DESTDIR)/$(libdir)/$$misc; \
- done
-
- # install commands with special installation needs (thus no $(SCMDS) use here)
- install-scmds:
- if test x$(SETGID_MAIL) != x; then \
-- $(INSTALL_PROGRAM) -g $(MAIL_SPOOL_GRP) -m 2755 inc $(bindir)/$$cmd; \
-+ $(INSTALL_PROGRAM) -g $(MAIL_SPOOL_GRP) -m 2755 inc $(DESTDIR)/$(bindir)/$$cmd; \
- else \
-- $(INSTALL_PROGRAM) inc $(bindir)/$$cmd; \
-+ $(INSTALL_PROGRAM) inc $(DESTDIR)/$(bindir)/$$cmd; \
- fi
-
- uninstall:
- for cmd in $(CMDS); do \
-- rm -f $(bindir)/$$cmd; \
-+ rm -f $(DESTDIR)/$(bindir)/$$cmd; \
- done
- for lcmd in $(LCMDS); do \
-- rm -f $(bindir)/$$lcmd; \
-+ rm -f $(DESTDIR)/$(bindir)/$$lcmd; \
- done
- for misc in $(MISC); do \
-- rm -f $(libdir)/$$misc; \
-+ rm -f $(DESTDIR)/$(libdir)/$$misc; \
- done
- for cmd in $(SCMDS); do \
-- rm -f $(bindir)/$$cmd; \
-+ rm -f $(DESTDIR)/$(bindir)/$$cmd; \
- done
-
- # ========== DEPENDENCIES FOR CLEANUP ==========
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/nmh-DESTDIR.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list