diff -Naur htmldoc-1.8.29-old/Makefile.in htmldoc-1.8.29/Makefile.in
--- htmldoc-1.8.29-old/Makefile.in 2011-12-23 08:23:11.000000000 +0200
+++ htmldoc-1.8.29/Makefile.in 2017-03-01 00:17:10.552174308 +0200
@@ -16,6 +16,10 @@
include Makedefs
+#
+# DESTDIR support...
+#
+DESTDIR ?= /
#
# Software packaging...
@@ -77,7 +81,7 @@
$(MAKE) all
for dir in $(INSTALLDIRS); do\
echo Installing in $$dir...;\
- (cd $$dir; $(MAKE) -$(MAKEFLAGS) install) || break;\
+ $(MAKE) install -C $$dir ; \
done
diff -Naur htmldoc-1.8.29-old/data/Makefile htmldoc-1.8.29/data/Makefile
--- htmldoc-1.8.29-old/data/Makefile 2011-12-23 08:23:11.000000000 +0200
+++ htmldoc-1.8.29/data/Makefile 2017-03-01 00:08:14.497536333 +0200
@@ -16,6 +16,10 @@
include ../Makedefs
+#
+# DESTDIR support...
+#
+DESTDIR ?= /
#
# Character set/glyph files...
@@ -41,11 +45,11 @@
#
install:
- if [ ! -d $(datadir)/htmldoc/data ]; then\
- $(MKDIR) $(datadir)/htmldoc/data;\
+ if [ ! -d $(DESTDIR)$(datadir)/htmldoc/data ]; then\
+ $(MKDIR) $(DESTDIR)$(datadir)/htmldoc/data;\
fi
- $(CP) $(FILES) $(datadir)/htmldoc/data
- $(CHMOD) ugo+r $(datadir)/htmldoc/data/*
+ $(CP) $(FILES) $(DESTDIR)$(datadir)/htmldoc/data
+ $(CHMOD) ugo+r $(DESTDIR)$(datadir)/htmldoc/data/*
#
diff -Naur htmldoc-1.8.29-old/doc/Makefile htmldoc-1.8.29/doc/Makefile
--- htmldoc-1.8.29-old/doc/Makefile 2016-01-03 00:58:41.000000000 +0200
+++ htmldoc-1.8.29/doc/Makefile 2017-03-01 00:08:39.842424836 +0200
@@ -16,6 +16,10 @@
include ../Makedefs
+#
+# DESTDIR support...
+#
+DESTDIR ?= /
#
# Documentation files...
@@ -45,16 +49,16 @@
#
install: $(DOCUMENTS)
- if test ! -d $(datadir)/doc/htmldoc; then\
- $(MKDIR) $(datadir)/doc/htmldoc;\
+ if test ! -d $(DESTDIR)$(datadir)/doc/htmldoc; then\
+ $(MKDIR) $(DESTDIR)$(datadir)/doc/htmldoc;\
fi
- $(CP) $(DOCFILES) $(datadir)/doc/htmldoc
- $(CHMOD) ugo+r $(datadir)/doc/htmldoc/*
- if test ! -d $(mandir)/man1; then\
- $(MKDIR) $(mandir)/man1;\
+ $(CP) $(DOCFILES) $(DESTDIR)$(datadir)/doc/htmldoc
+ $(CHMOD) ugo+r $(DESTDIR)$(datadir)/doc/htmldoc/*
+ if test ! -d $(DESTDIR)$(mandir)/man1; then\
+ $(MKDIR) $(DESTDIR)$(mandir)/man1;\
fi
- $(CP) htmldoc.man $(mandir)/man1/htmldoc.1
- $(CHMOD) ugo+r $(mandir)/man1/htmldoc.1
+ $(CP) htmldoc.man $(DESTDIR)$(mandir)/man1/htmldoc.1
+ $(CHMOD) ugo+r $(DESTDIR)$(mandir)/man1/htmldoc.1
#
diff -Naur htmldoc-1.8.29-old/fonts/Makefile htmldoc-1.8.29/fonts/Makefile
--- htmldoc-1.8.29-old/fonts/Makefile 2011-12-23 08:23:11.000000000 +0200
+++ htmldoc-1.8.29/fonts/Makefile 2017-03-01 00:07:49.053648245 +0200
@@ -16,6 +16,10 @@
include ../Makedefs
+#
+# DESTDIR support..
+#
+DESTDIR ?= /
#
# Standard fonts...
@@ -62,15 +66,15 @@
#
install:
- echo "Installing font files in $(datadir)/htmldoc/fonts..."
- if [ ! -d $(datadir)/htmldoc/fonts ]; then\
- $(MKDIR) $(datadir)/htmldoc/fonts;\
+ echo "Installing font files in $(DESTDIR)$(datadir)/htmldoc/fonts..."
+ if [ ! -d $(DESTDIR)$(datadir)/htmldoc/fonts ]; then\
+ $(MKDIR) $(DESTDIR)$(datadir)/htmldoc/fonts;\
fi
for font in $(FONTS); do \
- $(CP) $$font.afm $(datadir)/htmldoc/fonts; \
- $(CP) $$font.pfa $(datadir)/htmldoc/fonts; \
+ $(CP) $$font.afm $(DESTDIR)$(datadir)/htmldoc/fonts; \
+ $(CP) $$font.pfa $(DESTDIR)$(datadir)/htmldoc/fonts; \
done
- $(CHMOD) ugo+r $(datadir)/htmldoc/fonts/*
+ $(CHMOD) ugo+r $(DESTDIR)$(datadir)/htmldoc/fonts/*
#
diff -Naur htmldoc-1.8.29-old/htmldoc/Makefile htmldoc-1.8.29/htmldoc/Makefile
--- htmldoc-1.8.29-old/htmldoc/Makefile 2016-01-02 23:46:20.000000000 +0200
+++ htmldoc-1.8.29/htmldoc/Makefile 2017-03-01 00:09:01.478329642 +0200
@@ -16,6 +16,10 @@
include ../Makedefs
+#
+# DESTDIR support...
+#
+DESTDIR ?= /
#
# Object files...
@@ -38,11 +42,11 @@
#
install: all
- if [ ! -d $(bindir) ]; then\
- $(MKDIR) $(bindir);\
+ if [ ! -d $(DESTDIR)$(bindir) ]; then\
+ $(MKDIR) $(DESTDIR)$(bindir);\
fi
- cp htmldoc$(EXEEXT) $(bindir)
- chmod ugo+rx $(bindir)/htmldoc$(EXEEXT)
+ cp htmldoc$(EXEEXT) $(DESTDIR)$(bindir)
+ chmod ugo+rx $(DESTDIR)$(bindir)/htmldoc$(EXEEXT)
#
diff -Naur htmldoc-1.8.29-old/jpeg/Makefile htmldoc-1.8.29/jpeg/Makefile
--- htmldoc-1.8.29-old/jpeg/Makefile 2011-12-29 07:59:47.000000000 +0200
+++ htmldoc-1.8.29/jpeg/Makefile 2017-03-01 00:09:44.750139212 +0200
@@ -13,6 +13,11 @@
include ../Makedefs
#
+# DESTDIR support...
+#
+DESTDIR ?= /
+
+#
# Object files...
#
diff -Naur htmldoc-1.8.29-old/png/Makefile htmldoc-1.8.29/png/Makefile
--- htmldoc-1.8.29-old/png/Makefile 2011-12-29 08:00:22.000000000 +0200
+++ htmldoc-1.8.29/png/Makefile 2017-03-01 00:10:04.295053181 +0200
@@ -13,6 +13,11 @@
include ../Makedefs
#
+# DESTDIR support...
+#
+DESTDIR ?= /
+
+#
# Object files...
#
diff -Naur htmldoc-1.8.29-old/zlib/Makefile htmldoc-1.8.29/zlib/Makefile
--- htmldoc-1.8.29-old/zlib/Makefile 2011-12-29 08:01:42.000000000 +0200
+++ htmldoc-1.8.29/zlib/Makefile 2017-03-01 00:10:29.601941772 +0200
@@ -13,6 +13,11 @@
include ../Makedefs
#
+# DESTDIR support...
+#
+DESTDIR ?= /
+
+#
# Object files...
#