- install in DESTDIR

- sgml CATALOG is called CATALOG, not CATALOG.something

Changed files:
    happy-DESTDIR.patch -> 1.1
    happy-sgml-CATALOG.patch -> 1.1

diff --git a/happy-DESTDIR.patch b/happy-DESTDIR.patch
new file mode 100644 (file)
index 0000000..750e6cf
--- /dev/null
+++ b/happy-DESTDIR.patch
@@ -0,0 +1,142 @@
+--- happy-1.8/mk/target.mk~    Tue Jun 20 13:22:21 2000
++++ happy-1.8/mk/target.mk     Sat Nov 18 03:53:00 2000
+@@ -603,10 +603,10 @@
+ # on perl.
+ #
+ $(SCRIPT_LINK) : $(SCRIPT_PROG)
+-      @if ( $(PERL) -e '$$fn="$(SCRIPT_LINK)"; exit ((! -f $$fn || -l $$fn) ? 0 : 1);' ); then \
++      @if ( $(PERL) -e '$$fn="$(DESTDIR)$(SCRIPT_LINK)"; exit ((! -f $$fn || -l $$fn) ? 0 : 1);' ); then \
+          echo "Creating a symbolic link from $(SCRIPT_PROG) to $(SCRIPT_LINK)"; \
+-         $(RM) $(SCRIPT_LINK); \
+-         $(LN_S) $(SCRIPT_PROG) $(SCRIPT_LINK); \
++         $(RM) $(DESTDIR)$(SCRIPT_LINK); \
++         $(LN_S) $(SCRIPT_PROG) $(DESTDIR)$(SCRIPT_LINK); \
+        else \
+          echo "Creating a symbolic link from $(SCRIPT_PROG) to $(SCRIPT_LINK) failed: \`$(SCRIPT_LINK)' already exists"; \
+          echo "Perhaps remove \`$(SCRIPT_LINK)' manually?"; \
+@@ -652,10 +652,10 @@
+ # from the installation itself.
+ #
+ install-dirs ::
+-      @$(INSTALL_DIR) $(bindir)
+-      @$(INSTALL_DIR) $(libdir)
+-      @$(INSTALL_DIR) $(libexecdir)
+-      @$(INSTALL_DIR) $(datadir)
++      @$(INSTALL_DIR) $(DESTDIR)$(bindir)
++      @$(INSTALL_DIR) $(DESTDIR)$(libdir)
++      @$(INSTALL_DIR) $(DESTDIR)$(libexecdir)
++      @$(INSTALL_DIR) $(DESTDIR)$(datadir)
+ 
+ # Better do this first...
+ # but we won't for the moment, do it on-demand from
+@@ -682,10 +682,10 @@
+ INSTALL_PROGS := $(foreach p, $(INSTALL_PROGS), $(addsuffix $(subst _,,$(subst __,$(exeext),_$(suffix $(p))_)), $(basename $(p))))
+ 
+ install:: $(INSTALL_PROGS)
+-      @$(INSTALL_DIR) $(bindir)
++      @$(INSTALL_DIR) $(DESTDIR)$(bindir)
+       @for i in $(INSTALL_PROGS); do \
+-                  echo $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(bindir); \
+-                  $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(bindir) ;  \
++                  echo $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(DESTDIR)$(bindir); \
++                  $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(DESTDIR)$(bindir) ;  \
+       done
+ endif
+ 
+@@ -695,40 +695,40 @@
+ #
+ ifneq "$(INSTALL_SCRIPTS)" ""
+ install:: $(INSTALL_SCRIPTS)
+-      @$(INSTALL_DIR) $(bindir)
++      @$(INSTALL_DIR) $(DESTDIR)$(bindir)
+       for i in $(INSTALL_SCRIPTS); do \
+-              $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(bindir); \
++              $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(DESTDIR)$(bindir); \
+       done
+ endif
+ 
+ ifneq "$(INSTALL_LIB_SCRIPTS)" ""
+ install:: $(INSTALL_LIB_SCRIPTS)
+-      @$(INSTALL_DIR) $(libdir)
++      @$(INSTALL_DIR) $(DESTDIR)$(libdir)
+       for i in $(INSTALL_LIB_SCRIPTS); do \
+-              $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(libdir); \
++              $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(DESTDIR)$(libdir); \
+       done
+ endif
+ 
+ ifneq "$(INSTALL_LIBEXEC_SCRIPTS)" ""
+ install:: $(INSTALL_LIBEXEC_SCRIPTS)
+-      @$(INSTALL_DIR) $(libexecdir)
++      @$(INSTALL_DIR) $(DESTDIR)$(libexecdir)
+       for i in $(INSTALL_LIBEXEC_SCRIPTS); do \
+-              $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(libexecdir); \
++              $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(DESTDIR)$(libexecdir); \
+       done
+ endif
+ 
+ ifneq "$(INSTALL_LIBS)" ""
+ install:: $(INSTALL_LIBS)
+-      @$(INSTALL_DIR) $(libdir)
++      @$(INSTALL_DIR) $(DESTDIR)$(libdir)
+       for i in $(INSTALL_LIBS); do \
+               case $$i in \
+                 *.a) \
+-                  $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(libdir); \
+-                  $(RANLIB) $(libdir)/`basename $$i` ;; \
++                  $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(DESTDIR)$(libdir); \
++                  $(RANLIB) $(DESTDIR)$(libdir)/`basename $$i` ;; \
+                 *.dll) \
+-                  $(INSTALL_DATA) -s $(INSTALL_OPTS) $$i $(libdir) ;; \
++                  $(INSTALL_DATA) -s $(INSTALL_OPTS) $$i $(DESTDIR)$(libdir) ;; \
+                 *) \
+-                  $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(libdir); \
++                  $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(DESTDIR)$(libdir); \
+               esac; \
+       done
+ endif
+@@ -741,25 +741,25 @@
+ INSTALL_LIBEXECS := $(foreach p, $(INSTALL_LIBEXECS), $(addsuffix $(subst _,,$(subst __,$(exeext),_$(suffix $(p))_)), $(basename $(p))))
+ 
+ install:: $(INSTALL_LIBEXECS)
+-      @$(INSTALL_DIR) $(libexecdir)
++      @$(INSTALL_DIR) $(DESTDIR)$(libexecdir)
+       -for i in $(INSTALL_LIBEXECS); do \
+-              $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(libexecdir); \
++              $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(DESTDIR)$(libexecdir); \
+       done
+ endif
+ 
+ ifneq "$(INSTALL_DATAS)" ""
+ install:: $(INSTALL_DATAS)
+-      @$(INSTALL_DIR) $(datadir)
++      @$(INSTALL_DIR) $(DESTDIR)$(datadir)
+       for i in $(INSTALL_DATAS); do \
+-              $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir); \
++              $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(DESTDIR)$(datadir); \
+       done
+ endif
+ 
+ ifneq "$(INSTALL_INCLUDES)" ""
+ install:: $(INSTALL_INCLUDES)
+-      @$(INSTALL_DIR) $(includedir)
++      @$(INSTALL_DIR) $(DESTDIR)$(includedir)
+       for i in $(INSTALL_INCLUDES); do \
+-              $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(includedir); \
++              $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir); \
+       done
+ endif
+ 
+@@ -805,9 +805,9 @@
+ #
+ ifneq "$(SCRIPT_LINK)" ""
+ install ::
+-      @if ( $(PERL) -e '$$fn="$(bindir)/$(SCRIPT_LINK)"; exit ((! -f $$fn || -l $$fn) ? 0 : 1);' ); then \
++      @if ( $(PERL) -e '$$fn="$(DESTDIR)$(bindir)/$(SCRIPT_LINK)"; exit ((! -f $$fn || -l $$fn) ? 0 : 1);' ); then \
+          echo "Creating a symbol link from $(SCRIPT_PROG) to $(SCRIPT_LINK) in $(bindir)"; \
+-         $(RM) $(bindir)/$(SCRIPT_LINK); \
+-         $(LN_S) $(SCRIPT_PROG) $(bindir)/$(SCRIPT_LINK); \
++         $(RM) $(DESTDIR)$(bindir)/$(SCRIPT_LINK); \
++         $(LN_S) $(SCRIPT_PROG) $(DESTDIR)$(bindir)/$(SCRIPT_LINK); \
+        else \
+          echo "Creating a symbol link from $(SCRIPT_PROG) to $(SCRIPT_LINK) in $(bindir) failed: \`$(bindir)/$(SCRIPT_LINK)' already exists"; \

diff --git a/happy-sgml-CATALOG.patch b/happy-sgml-CATALOG.patch
new file mode 100644 (file)
index 0000000..44b8f79
--- /dev/null
+++ b/happy-sgml-CATALOG.patch
@@ -0,0 +1,11 @@
+--- happy-1.8/configure.in~    Tue Jul 11 12:52:24 2000
++++ happy-1.8/configure.in     Sat Nov 18 03:37:18 2000
+@@ -501,7 +501,7 @@
+ dnl ** check for jade/openjade & determine a working catalog
+ AC_PATH_PROGS(JadeCmd,openjade jade,jade)
+ FPTOOLS_DOCBOOK_CATALOG(Catalog, $JadeCmd, docs/fptools-both.dsl, 
+-                        /usr/share/sgml/CATALOG.docbkdsl $hardtop/glafp-utils/docbook/CATALOG*)
++                        /usr/share/sgml/CATALOG $hardtop/glafp-utils/docbook/CATALOG*)
+ if test -z "$Catalog"; then
+   AC_MSG_RESULT([Warning: You will not be able to build the documentation.])
+ fi