- patch updated

Changed files:
    icewm-DESTDIR.patch -> 1.5

diff --git a/icewm-DESTDIR.patch b/icewm-DESTDIR.patch
index b1f2ba36d89b650e1038ded3b31136e7968a480c..c506fb5bdf149c04577ed1ea322a876cc0a2ab71 100644 (file)
--- a/icewm-DESTDIR.patch
+++ b/icewm-DESTDIR.patch
@@ -1,104 +1,139 @@
---- icewm-1.0.7/po/Makefile.orig       Sun Mar 25 01:54:17 2001
-+++ icewm-1.0.7/po/Makefile    Sun Mar 25 01:53:08 2001
-@@ -23,8 +23,8 @@
+--- icewm-1.0.8/po/Makefile.orig       Tue Apr 24 17:24:52 2001
++++ icewm-1.0.8/po/Makefile    Tue Apr 24 17:27:06 2001
+@@ -18,10 +18,10 @@
+ all: $(MOFILES)
+ 
+ install: all
+-      @echo Installing localized messages in $(LOCDIR)
++      @echo Installing localized messages in $(DESTDIR)$(LOCDIR)
+       @for c in $(MOFILES); do \
          LANG=`echo $$c|sed -e 's/.mo//'` ; \
-         MSGDIR="$(LOCDIR)/$$LANG/LC_MESSAGES"; \
+-        MSGDIR="$(LOCDIR)/$$LANG/LC_MESSAGES"; \
++        MSGDIR="$(DESTDIR)$(LOCDIR)/$$LANG/LC_MESSAGES"; \
          echo Installing language: $$LANG ; \
--        $(INSTALLDIR) $$MSGDIR; \
--        $(INSTALLLIB) $$c $$MSGDIR/$(PACKAGE).mo; \
-+        $(INSTALLDIR) $(DESTDIR)$$MSGDIR; \
-+        $(INSTALLLIB) $$c $(DESTDIR)$$MSGDIR/$(PACKAGE).mo; \
-       done
+         $(INSTALLDIR) $$MSGDIR; \
+         $(INSTALLLIB) $$c $$MSGDIR/$(PACKAGE).mo; \
+--- icewm-1.0.8/Makefile.in.orig       Tue Apr 24 17:06:18 2001
++++ icewm-1.0.8/Makefile.in    Tue Apr 24 17:16:51 2001
+@@ -61,71 +61,71 @@
+           -e "s|@@VERSION@@|$(VERSION)|g" \
+           -e "s|@@DATE@@|`date +%d%b%Y | tr 'a-z' 'A-Z'`|"
  
- clean:
---- icewm-1.0.7/Makefile.in.orig       Sun Mar 25 01:39:53 2001
-+++ icewm-1.0.7/Makefile.in    Sun Mar 25 01:46:49 2001
-@@ -62,37 +62,37 @@
- # Makefile TABS *SUCK*
+-# Makefile TABS *SUCK*
++
  install-base: base
        @echo ------------------------------------------
--      @echo Installing icewm to $(BINDIR)
+-      @echo Installing icewm in $(BINDIR)
 -      @$(INSTALLDIR) $(BINDIR)
-+      @echo Installing icewm to $(DESTDIR)$(BINDIR)
++      @echo Installing icewm in $(DESTDIR)$(BINDIR)
 +      @$(INSTALLDIR) $(DESTDIR)$(BINDIR)
        @for app in $(BINFILES) ; do \
--            $(INSTALLBIN) $$app $(BINDIR); \
-+            $(INSTALLBIN) $$app $(DESTDIR)$(BINDIR); \
+-            $(INSTALLBIN) "$$app" $(BINDIR); \
++            $(INSTALLBIN) "$$app" $(DESTDIR)$(BINDIR); \
          done
--      @echo Installing defaults, icons and themes to $(LIBDIR)
+-      @echo Installing defaults, icons and themes in $(LIBDIR)
 -      @$(INSTALLDIR) $(LIBDIR)
 -      @$(INSTALLDIR) $(CFGDIR)
-+      @echo Installing defaults, icons and themes to $(DESTDIR)$(LIBDIR)
++      @echo Installing defaults, icons and themes in $(DESTDIR)$(LIBDIR)
 +      @$(INSTALLDIR) $(DESTDIR)$(LIBDIR)
 +      @$(INSTALLDIR) $(DESTDIR)$(CFGDIR)
        @for lib in $(LIBFILES) ; do \
--            $(INSTALLLIB) $$lib $(LIBDIR); \
-+            $(INSTALLLIB) $$lib $(DESTDIR)$(LIBDIR); \
+-            $(INSTALLLIB) "$$lib" $(LIBDIR); \
++            $(INSTALLLIB) "$$lib" $(DESTDIR)$(LIBDIR); \
          done
-       @for xpmdir in $(XPMDIRS) ; do \
--            $(INSTALLDIR) $(LIBDIR)/$$xpmdir; \
-+            $(INSTALLDIR) $(DESTDIR)$(LIBDIR)/$$xpmdir; \
-             for icon in lib/$$xpmdir/*.xpm ; do \
--                $(INSTALLLIB) $$icon $(LIBDIR)/$$xpmdir; \
-+                $(INSTALLLIB) $$icon $(DESTDIR)$(LIBDIR)/$$xpmdir; \
-             done; \
+       @for xpmdir in $(XPMDIRS); do \
+           if test -d lib/$$xpmdir; then \
+-              $(INSTALLDIR) $(LIBDIR)/$$xpmdir; \
++              $(INSTALLDIR) $(DESTDIR)$(LIBDIR)/$$xpmdir; \
+               for pixmap in lib/$$xpmdir/*.xpm ; do \
+-                  $(INSTALLLIB) "$$pixmap" $(LIBDIR)/$$xpmdir; \
++                  $(INSTALLLIB) "$$pixmap" $(DESTDIR)$(LIBDIR)/$$xpmdir; \
+               done; \
+           fi; \
          done
        @for theme in $(THEMES) ; do \
              echo Installing theme: $$theme; \
 -            $(INSTALLDIR) $(LIBDIR)/themes/$$theme; \
 +            $(INSTALLDIR) $(DESTDIR)$(LIBDIR)/themes/$$theme; \
-             for pixmap in lib/themes/$$theme/*.xpm ; do \
--                $(INSTALLLIB) $$pixmap $(LIBDIR)/themes/$$theme; \
-+                $(INSTALLLIB) $$pixmap $(DESTDIR)$(LIBDIR)/themes/$$theme; \
+             for pixmap in lib/themes/$$theme/*.xpm; do \
+-                $(INSTALLLIB) "$$pixmap" $(LIBDIR)/themes/$$theme; \
++                $(INSTALLLIB) "$$pixmap" $(DESTDIR)$(LIBDIR)/themes/$$theme; \
              done; \
-             for config in lib/themes/$$theme/*.theme ; do \
--                $(INSTALLLIB) $$config $(LIBDIR)/themes/$$theme; \
-+                $(INSTALLLIB) $$config $(DESTDIR)$(LIBDIR)/themes/$$theme; \
+             for subtheme in lib/themes/$$theme/*.theme; do \
+-                $(INSTALLLIB) "$$subtheme" $(LIBDIR)/themes/$$theme; \
++                $(INSTALLLIB) "$$subtheme" $(DESTDIR)$(LIBDIR)/themes/$$theme; \
              done; \
-             for l in $(XPMDIRS) ; do \
-                 if [ -d lib/themes/$$theme/$$l ] ; then \
--                    $(INSTALLDIR) $(LIBDIR)/themes/$$theme/$$l; \
-+                    $(INSTALLDIR) $(DESTDIR)$(LIBDIR)/themes/$$theme/$$l; \
-                     for f in lib/themes/$$theme/$$l/* ; do \
--                        $(INSTALLLIB) $$f $(LIBDIR)/themes/$$theme/$$l; \
-+                        $(INSTALLLIB) $$f $(DESTDIR)$(LIBDIR)/themes/$$theme/$$l; \
+           if test -f lib/themes/$$theme/*.pcf; then \
+                 for fontfile in lib/themes/$$theme/*.pcf; do \
+-                  $(INSTALLLIB) "$$fontfile" $(LIBDIR)/themes/$$theme; \
++                  $(INSTALLLIB) "$$fontfile" $(DESTDIR)$(LIBDIR)/themes/$$theme; \
+               done; \
+               if test -x "$(MKFONTDIR)"; then \
+-                cd "$(LIBDIR)/themes/$$theme"; \
++                cd "$(DESTDIR)$(LIBDIR)/themes/$$theme"; \
+                 $(MKFONTDIR); \
+               else \
+                 echo "WARNING: A dummy file has been copied to"; \
+-                echo "         $(LIBDIR)/themes/$$theme/fonts.dir"; \
++                echo "         $(DESTDIR)$(LIBDIR)/themes/$$theme/fonts.dir"; \
+                 echo "         You better setup your path to point to mkfontdir or use the"; \
+                 echo "         --with-mkfontdir option of the configure script."; \
+-                $(INSTALLLIB) "lib/themes/$$theme/fonts.dir.default" \
+-                              "$(LIBDIR)/themes/$$theme/fonts.dir"; \
++                $(INSTALLLIB) "$(DESTDIR)/lib/themes/$$theme/fonts.dir.default" \
++                              "$(DESTDIR)$(LIBDIR)/themes/$$theme/fonts.dir"; \
+               fi; \
+           fi; \
+             for xpmdir in $(XPMDIRS) ; do \
+                 if [ -d lib/themes/$$theme/$$xpmdir ] ; then \
+-                    $(INSTALLDIR) $(LIBDIR)/themes/$$theme/$$xpmdir; \
++                    $(INSTALLDIR) $(DESTDIR)$(LIBDIR)/themes/$$theme/$$xpmdir; \
+                     for f in lib/themes/$$theme/$$xpmdir/*.xpm ; do \
+-                        $(INSTALLLIB) "$$f" $(LIBDIR)/themes/$$theme/$$xpmdir; \
++                        $(INSTALLLIB) "$$f" $(DESTDIR)$(LIBDIR)/themes/$$theme/$$xpmdir; \
                      done;\
                  fi;\
              done;\
-@@ -101,9 +101,9 @@
+         done
+       @#for a in $(ETCFILES) ; do $(INSTALLETC) "$$a" $(CFGDIR) ; done
  
- install-docs: docs $(LSM)
+-install-docs: docs $(LSM)
++
        @echo ------------------------------------------
+-      @rm -fr $(DOCDIR)/icewm-$(VERSION)
 -      @$(INSTALLDIR) $(DOCDIR)/icewm-$(VERSION)
--      cp $(DOCFILES) $(DOCDIR)/icewm-$(VERSION)
--      cp -r doc $(DOCDIR)/icewm-$(VERSION)
+-      @echo Installing documentation in $(DOCDIR); \
+-      cp $(DOCFILES) $(DOCDIR)/icewm-$(VERSION); \
+-      cp -r doc/*.{sgml,html} $(DOCDIR)/icewm-$(VERSION)
++      @rm -fr $(DESTDIR)$(DOCDIR)/icewm-$(VERSION)
 +      @$(INSTALLDIR) $(DESTDIR)$(DOCDIR)/icewm-$(VERSION)
-+      cp $(DOCFILES) $(DESTDIR)$(DOCDIR)/icewm-$(VERSION)
-+      cp -r doc $(DESTDIR)$(DOCDIR)/icewm-$(VERSION)
++      @echo Installing documentation in $(DESTDIR)$(DOCDIR); \
++      cp $(DOCFILES) $(DESTDIR)$(DOCDIR)/icewm-$(VERSION); \
++      cp -r doc/*.{sgml,html} $(DESTDIR)$(DOCDIR)/icewm-$(VERSION)
  
  install-nls: nls
        @echo ------------------------------------------
-@@ -111,12 +111,12 @@
+@@ -133,12 +133,12 @@
  
  install-%: %
        @echo ------------------------------------------
--      @echo Installing $* to $(BINDIR)
+-      @echo Installing $* in $(BINDIR)
 -      @$(INSTALLDIR) $(BINDIR)
 -      @$(INSTALLBIN) src/$* $(BINDIR)
-+      @echo Installing $* to $(DESTDIR)$(BINDIR)
++      @echo Installing $* in $(DESTDIR)$(BINDIR)
 +      @$(INSTALLDIR) $(DESTDIR)$(BINDIR)
 +      @$(INSTALLBIN) src/$* $(DESTDIR)$(BINDIR)
  
  install-gnome: gnome
        @echo ------------------------------------------
--      @echo Installing icewm-gnome to $(WMPROPDIR)
+-      @echo Installing icewm-gnome in $(WMPROPDIR)
 -      @$(INSTALLDIR) $(WMPROPDIR)
 -      @$(INSTALLLIB) lib/IceWM.desktop $(WMPROPDIR)
-+      @echo Installing icewm-gnome to $(DESTDIR)$(WMPROPDIR)
++      @echo Installing icewm-gnome in $(DESTDIR)$(WMPROPDIR)
 +      @$(INSTALLDIR) $(DESTDIR)$(WMPROPDIR)
 +      @$(INSTALLLIB) lib/IceWM.desktop $(DESTDIR)$(WMPROPDIR)
---- icewm-1.0.7/configure.in.orig      Sun Mar 25 01:49:37 2001
-+++ icewm-1.0.7/configure.in   Sun Mar 25 01:52:02 2001
+--- icewm-1.0.8/configure.in.orig      Tue Apr 24 17:17:17 2001
++++ icewm-1.0.8/configure.in   Tue Apr 24 17:17:46 2001
 @@ -66,7 +66,7 @@
  AC_FUNC_SELECT_ARGTYPES
  
@@ -108,5 +143,3 @@
  
  dnl Checking for X11
  AC_PATH_XTRA
- 
-