[patch] linuxdoc-tools-0.9.21-destdir.patch

linuxdoc-tools-0.9.21-destdir.patch (text/plain), 8.96 KB, created by Josh Nichols (RETIRED) on 2005-04-06 23:22:29 UTC

Only in linuxdoc-tools-0.9.21-patched/: .Makefile.in.swp
diff -ur linuxdoc-tools-0.9.21/Makefile.in linuxdoc-tools-0.9.21-patched/Makefile.in
--- linuxdoc-tools-0.9.21/Makefile.in	2002-01-28 12:43:59.000000000 -0500
+++ linuxdoc-tools-0.9.21-patched/Makefile.in	2005-04-07 02:08:32.165452376 -0400
@@ -67,15 +67,15 @@
 	done
 
 install::
-	@echo "Installing binaries in $(bindir) ..."
-	if [ ! -d $(bindir) ]; then mkdir -p $(bindir); fi
-	-chmod 755 $(bindir)
+	@echo "Installing binaries in $(DESTDIR)$(bindir) ..."
+	if [ ! -d $(DESTDIR)$(bindir) ]; then mkdir -p $(DESTDIR)$(bindir); fi
+	-chmod 755 $(DESTDIR)$(bindir)
 # nsgmls or onsgmls should be installed already
 # ifeq ($(BUILD_NSGMLS), true)
 #	$(INSTALL_PROGRAM) sp/nsgmls/nsgmls $(bindir)/nsgmls
 # endif
 ifeq ($(BUILD_SGMLSASP), true)
-	$(INSTALL_PROGRAM) sgmls-1.1/sgmlsasp $(bindir)/sgmlsasp
+	$(INSTALL_PROGRAM) sgmls-1.1/sgmlsasp $(DESTDIR)$(bindir)/sgmlsasp
 endif
 ifeq ($(BUILD_ENTITY_MAP), true)
 	@echo "Installing Entity Mapping library (in entity-map)..."
@@ -90,50 +90,51 @@
 	strip sgmlpre/sgmlpre
 	for ii in sgmlpre/sgmlpre rtf-fix/rtf2rtf; do \
 	  bn=`basename $$ii`; \
-	  $(INSTALL_PROGRAM) $$ii $(bindir)/$$bn; \
+	  $(INSTALL_PROGRAM) $$ii $(DESTDIR)$(bindir)/$$bn; \
 	done
-	$(INSTALL_PROGRAM) bin/linuxdoc $(bindir)/linuxdoc
+	$(INSTALL_PROGRAM) bin/linuxdoc $(DESTDIR)$(bindir)/linuxdoc
 	@echo "Installing library and support files in $(pkgdatadir)..."
-	if [ ! -d $(pkgdatadir) ]; then mkdir -p $(pkgdatadir); fi
-	chmod 755 $(pkgdatadir)
-	cp -r lib/* $(pkgdatadir)
-	cp VERSION $(pkgdatadir)
-	@echo "Installing man pages in $(mandir1) ..." 
-	if [ ! -d $(mandir1) ]; then mkdir -p $(mandir1) ; fi
-	-chmod 755 $(mandir1)
+	if [ ! -d $(DESTDIR)$(pkgdatadir) ]; then mkdir -p $(DESTDIR)$(pkgdatadir); fi
+	chmod 755 $(DESTDIR)$(pkgdatadir)
+	cp -r lib/* $(DESTDIR)$(pkgdatadir)
+	cp VERSION $(DESTDIR)$(pkgdatadir)
+	@echo "Installing man pages in $(DESTDIR)$(mandir1) ..." 
+	if [ ! -d $(DESTDIR)$(mandir1) ]; then mkdir -p $(DESTDIR)$(mandir1) ; fi
+	-chmod 755 $(DESTDIR)$(mandir1)
 	for ii in genman/sgml2* genman/sgmlcheck.1 \
 	          genman/rtf*.1 genman/sgmlpre*.1; do \
 	  bn=`basename $$ii`; \
-	  $(INSTALL_DATA) $$ii $(mandir1)/$$bn; \
+	  $(INSTALL_DATA) $$ii $(DESTDIR)$(mandir1)/$$bn; \
 	done
-	$(INSTALL_DATA) genman/linuxdoc.1 $(mandir1)/linuxdoc.1
+	$(INSTALL_DATA) genman/linuxdoc.1 $(DESTDIR)$(mandir1)/linuxdoc.1
 ifeq ($(BUILD_NSGMLS), true)
-	$(INSTALL_DATA) man/nsgmls.1 $(mandir1)/nsgmls.1
+	$(INSTALL_DATA) man/nsgmls.1 $(DESTDIR)$(mandir1)/nsgmls.1
 endif
 ifeq ($(BUILD_SGMLSASP), true)
-	$(INSTALL_DATA) man/sgmlsasp.1 $(mandir1)/sgmlsasp.1
+	$(INSTALL_DATA) man/sgmlsasp.1 $(DESTDIR)$(mandir1)/sgmlsasp.1
 endif
-	find $(pkgdatadir) -type d -print | xargs chmod 755
-	find $(pkgdatadir) -type f -print | xargs chmod 644
-	(cd $(pkgdatadir)/dist/linuxdoc-tools/latin1; rm -f mapping; ln -s ../groff/mapping .)
-	(cd $(pkgdatadir)/dist/linuxdoc-tools/nippon; rm -f mapping; ln -s ../groff/tr-mapping ./mapping)
-	(cd $(pkgdatadir)/dist; rm -f linuxdoc; ln -s linuxdoc-tools linuxdoc)
-	(cd $(pkgdatadir)/dist; rm -f linuxdoctr; ln -s linuxdoc-tools linuxdoctr)
-	(cd $(pkgdatadir)/dist; rm -f linuxdoc96; ln -s linuxdoc-tools linuxdoc96)
-	(cd $(pkgdatadir)/dist; rm -f linuxdoctr96; ln -s linuxdoc-tools linuxdoctr96)
-	(cd $(pkgdatadir)/dist; rm -f linuxdoc97; ln -s linuxdoc-tools linuxdoc97)
-	(cd $(pkgdatadir)/dtd;  rm -f linuxdoc.dtd; ln -s linuxdoc96.dtd linuxdoc.dtd)
-	(cd $(pkgdatadir)/dtd;  rm -f linuxdoctr.dtd; ln -s linuxdoctr96.dtd linuxdoctr.dtd)
-	(cd $(bindir); for i in $(progs); do rm -f $$i; ln -s linuxdoc $$i;done)
-	@echo "Installing documentation in $(LINUXDOCDOC) ..."
-	(cd doc; PATH=${PATH}:$(bindir) PREFIX=$(prefix) BINDIR=$(bindir) \
-	 DATADIR=$(datadir) bash Makedoc.sh)
-	if [ ! -d $(LINUXDOCDOC) ]; then mkdir -p $(LINUXDOCDOC); fi
-	chmod 755 $(LINUXDOCDOC)
-	cp -r doc/* $(LINUXDOCDOC)
-	rm -f $(LINUXDOCDOC)/Makedoc.sh
-	find $(LINUXDOCDOC) -type d -print | xargs chmod 755
-	find $(LINUXDOCDOC) -type f -print | xargs chmod 644
+	find $(DESTDIR)$(pkgdatadir) -type d -print | xargs chmod 755
+	find $(DESTDIR)$(pkgdatadir) -type f -print | xargs chmod 644
+	(cd $(DESTDIR)$(pkgdatadir)/dist/linuxdoc-tools/latin1; rm -f mapping; ln -s ../groff/mapping .)
+	(cd $(DESTDIR)$(pkgdatadir)/dist/linuxdoc-tools/nippon; rm -f mapping; ln -s ../groff/tr-mapping ./mapping)
+	(cd $(DESTDIR)$(pkgdatadir)/dist; rm -f linuxdoc; ln -s linuxdoc-tools linuxdoc)
+	(cd $(DESTDIR)$(pkgdatadir)/dist; rm -f linuxdoctr; ln -s linuxdoc-tools linuxdoctr)
+	(cd $(DESTDIR)$(pkgdatadir)/dist; rm -f linuxdoc96; ln -s linuxdoc-tools linuxdoc96)
+	(cd $(DESTDIR)$(pkgdatadir)/dist; rm -f linuxdoctr96; ln -s linuxdoc-tools linuxdoctr96)
+	(cd $(DESTDIR)$(pkgdatadir)/dist; rm -f linuxdoc97; ln -s linuxdoc-tools linuxdoc97)
+	(cd $(DESTDIR)$(pkgdatadir)/dtd;  rm -f linuxdoc.dtd; ln -s linuxdoc96.dtd linuxdoc.dtd)
+	(cd $(DESTDIR)$(pkgdatadir)/dtd;  rm -f linuxdoctr.dtd; ln -s linuxdoctr96.dtd linuxdoctr.dtd)
+	(cd $(DESTDIR)$(bindir); for i in $(progs); do rm -f $$i; ln -s linuxdoc $$i;done)
+	@echo "Installing documentation in $(DESTDIR)$(LINUXDOCDOC) ..."
+	# TODO: fix Makedoc.sh play work without installing files to the system (using DESTDIR)
+	(cd doc; PATH="${PATH}:${DESTDIR}${bindir}" PREFIX=$(prefix) BINDIR=$(bindir) \
+	 DATADIR=$(DESTDIR)$(datadir) bash Makedoc.sh)
+	if [ ! -d $(DESTDIR)$(LINUXDOCDOC) ]; then mkdir -p $(DESTDIR)$(LINUXDOCDOC); fi
+	chmod 755 $(DESTDIR)$(LINUXDOCDOC)
+	cp -r doc/* $(DESTDIR)$(LINUXDOCDOC)
+	rm -f $(DESTDIR)$(LINUXDOCDOC)/Makedoc.sh
+	find $(DESTDIR)$(LINUXDOCDOC) -type d -print | xargs chmod 755
+	find $(DESTDIR)$(LINUXDOCDOC) -type f -print | xargs chmod 644
 
 # what dirs do the targets clean and distclean need?
 DDIRS=
Only in linuxdoc-tools-0.9.21-patched/: destdir
Only in linuxdoc-tools-0.9.21-patched/doc: .Makedoc.sh.swp
diff -ur linuxdoc-tools-0.9.21/entity-map/Makefile.in linuxdoc-tools-0.9.21-patched/entity-map/Makefile.in
--- linuxdoc-tools-0.9.21/entity-map/Makefile.in	2001-11-30 18:41:44.000000000 -0500
+++ linuxdoc-tools-0.9.21-patched/entity-map/Makefile.in	2005-04-07 00:48:15.359718152 -0400
@@ -53,20 +53,20 @@
 	  -e 's|[@]entitymapdir@|${entitymapdir}|g'
 
 install: all installdirs
-	${INSTALL_DATA} EntityMap.pm ${textmoddir}/EntityMap.pm
+	${INSTALL_DATA} EntityMap.pm $(DESTDIR)${textmoddir}/EntityMap.pm
 	cd sdata; $(MAKE) LIBDIR=${entitymapdir} \
 	  PERM_D=755 PERM_F=644 MKDIR="../config/install-sh -d" CP=cp install
 
 installdirs:
 	for ii in ${prefix} ${perl5libdir} ${textmoddir} \
-	  ${localentitymapdir} ${entitymapdir}; do \
-	  ./config/install-sh -d $$ii; \
+	  ${localentitymapdir} $(DESTDIR)${entitymapdir}; do \
+	  ./config/install-sh -d $(DESTDIR)$$ii; \
 	done
 
 installdoc:
-	./config/install-sh -d ${docdir}
+	./config/install-sh -d $(DESTDIR)${docdir}
 	for ii in ${DOCS}; do \
-	  ${INSTALL_DATA} $$ii ${docdir}/$$ii; \
+	  ${INSTALL_DATA} $$ii $(DESTDIR)${docdir}/$$ii; \
 	done
 
 Makefile: Makefile.in configure
diff -ur linuxdoc-tools-0.9.21/entity-map/sdata/Makefile linuxdoc-tools-0.9.21-patched/entity-map/sdata/Makefile
--- linuxdoc-tools-0.9.21/entity-map/sdata/Makefile	2001-05-24 11:57:40.000000000 -0400
+++ linuxdoc-tools-0.9.21-patched/entity-map/sdata/Makefile	2005-04-07 01:22:54.095702248 -0400
@@ -14,13 +14,13 @@
  greek.2html lat1.2sdata
 
 install: 
-	if [ ! -d $(LIBDIR) ]; then \
-	  $(MKDIR) $(LIBDIR); \
-	  chmod $(PERM_D) $(LIBDIR); \
+	if [ ! -d $(DESTDIR)$(LIBDIR) ]; then \
+	  $(MKDIR) $(DESTDIR)$(LIBDIR); \
+	  chmod $(PERM_D) $(DESTDIR)$(LIBDIR); \
 	fi
-	$(CP) $(SDATAFILES) $(LIBDIR)
-	(cd $(LIBDIR); chmod $(PERM_F) $(SDATAFILES))
-	(cd $(LIBDIR); \
+	$(CP) $(SDATAFILES) $(DESTDIR)$(LIBDIR)
+	( cd $(DESTDIR)$(LIBDIR); chmod $(PERM_F) $(SDATAFILES) )
+	( cd $(DESTDIR)$(LIBDIR); \
 	 rm -f ISOlat1.2rtf ISOlat1.2texi ISOlat1.2tr ISOlat1.2l1s ISOlat1.2l1tr \
 	       ISOlat2.2l1b ISOlat2.2l1s \
 	       ISOdia.2rtf ISOdia.2texi ISOdia.2l1b ISOdia.2l1s ISOdia.2l1tr \
Only in linuxdoc-tools-0.9.21-patched/: install
diff -ur linuxdoc-tools-0.9.21/iso-entities/Makefile.in linuxdoc-tools-0.9.21-patched/iso-entities/Makefile.in
--- linuxdoc-tools-0.9.21/iso-entities/Makefile.in	2001-05-24 11:57:40.000000000 -0400
+++ linuxdoc-tools-0.9.21-patched/iso-entities/Makefile.in	2005-04-07 00:44:11.561781072 -0400
@@ -39,20 +39,20 @@
 all:
 
 install: all installdirs
-	${INSTALL_DATA} iso-entities.cat ${isoentdir}/iso-entities.cat
+	${INSTALL_DATA} iso-entities.cat $(DESTDIR)${isoentdir}/iso-entities.cat
 	for ii in `cd entities; find . -type f`; do \
-	  ${INSTALL_DATA} entities/$$ii ${isoentdir}/$$ii; \
+	  ${INSTALL_DATA} entities/$$ii $(DESTDIR)${isoentdir}/$$ii; \
 	done
 
 installdirs:
 	for ii in ${sgmldir} ${isoentdir}; do \
-	  ./config/install-sh -d $$ii; \
+	  ./config/install-sh -d $(DESTDIR)$$ii; \
 	done
 
 installdoc:
-	./config/install-sh -d ${docdir}
+	./config/install-sh -d $(DESTDIR)${docdir}
 	for ii in ${DOCS}; do \
-	  ${INSTALL_DATA} $$ii ${docdir}/$$ii; \
+	  ${INSTALL_DATA} $$ii $(DESTDIR)${docdir}/$$ii; \
 	done
 
 Makefile: Makefile.in configure