9231eca07f8aa39b06f3a94e400676e4 icewm-1.0.6-4.tar.bz2

Changed files:
    icewm-DESTDIR.patch -> 1.2

diff --git a/icewm-DESTDIR.patch b/icewm-DESTDIR.patch
index 19a8cc868df57806adb0591ad58ed251a0d29d8a..03e2834deab9d2e0ff6bb5a29e4568e346ecb119 100644 (file)
--- a/icewm-DESTDIR.patch
+++ b/icewm-DESTDIR.patch
@@ -1,24 +1,25 @@
-diff -Nru icewm-1.0.5/Makefile.in icewm-1.0.5.new/Makefile.in
---- icewm-1.0.5/Makefile.in    Sat Dec 16 04:34:56 2000
-+++ icewm-1.0.5.new/Makefile.in        Sat Dec 16 04:34:36 2000
-@@ -62,57 +62,51 @@
+diff -urN icewm-1.0.6.org/Makefile.in icewm-1.0.6/Makefile.in
+--- icewm-1.0.6.org/Makefile.in        Wed Jan 17 19:04:09 2001
++++ icewm-1.0.6/Makefile.in    Wed Jan 17 19:54:39 2001
+@@ -67,37 +67,37 @@
  # Makefile TABS *SUCK*
  install-base: base
        @echo ------------------------------------------
 -      @echo Installing icewm to $(BINDIR)
 -      @$(INSTALLDIR) $(BINDIR)
+-      @for app in $(BINFILES) ; do \
+-            $(INSTALLBIN) $$app $(BINDIR); \
 +      @echo Installing icewm to $(DESTDIR)$(BINDIR)
 +      @$(INSTALLDIR) $(DESTDIR)$(BINDIR)
-       @for app in $(BINFILES) ; do \
--            $(INSTALLBIN) $$app $(BINDIR); \
++      @for app in $(DESTDIR)$(BINFILES) ; do \
 +            $(INSTALLBIN) $$app $(DESTDIR)$(BINDIR); \
          done
 -      @echo Installing defaults, icons and themes to $(LIBDIR)
 -      @$(INSTALLDIR) $(LIBDIR)
--      @$(INSTALLDIR) $(ETCDIR)
+-      @$(INSTALLDIR) $(CFGDIR)
 +      @echo Installing defaults, icons and themes to $(DESTDIR)$(LIBDIR)
 +      @$(INSTALLDIR) $(DESTDIR)$(LIBDIR)
-+      @$(INSTALLDIR) $(DESTDIR)$(ETCDIR)
++      @$(INSTALLDIR) $(DESTDIR)$(CFGDIR)
        @for lib in $(LIBFILES) ; do \
 -            $(INSTALLLIB) $$lib $(LIBDIR); \
 +            $(INSTALLLIB) $$lib $(DESTDIR)$(LIBDIR); \
@@ -53,34 +54,43 @@ diff -Nru icewm-1.0.5/Makefile.in icewm-1.0.5.new/Makefile.in
                      done;\
                  fi;\
              done;\
-         done
--      @#for a in $(ETCFILES) ; do $(INSTALLETC) $$a $(ETCDIR) ; done
--
--install-docs: docs $(LSM)
--      @echo ------------------------------------------
+@@ -106,24 +106,24 @@
+ 
+ install-docs: docs $(LSM)
+       @echo ------------------------------------------
 -      @$(INSTALLDIR) $(DOCDIR)/icewm-$(VERSION)
 -      cp $(DOCFILES) $(DOCDIR)/icewm-$(VERSION)
 -      cp -r doc $(DOCDIR)/icewm-$(VERSION)
-+      @#for a in $(ETCFILES) ; do $(INSTALLETC) $$a $(DESTDIR)$(ETCDIR) ; done
++      @$(INSTALLDIR) $(DESTDIR)$(DOCDIR)/icewm-$(VERSION)
++      cp $(DOCFILES) $(DESTDIR)$(DOCDIR)/icewm-$(VERSION)
++      cp -r doc $(DESTDIR)$(DOCDIR)/icewm-$(VERSION)
  
  install-nls: nls
        @echo ------------------------------------------
 -      @cd po ; ${MAKE} install
 +      @cd po ; ${MAKE} DESTDIR=$(DESTDIR) install
  
- install-gnome: gnome
+ install-guievents: guievents
        @echo ------------------------------------------
--      @echo Installing icewm-gnome to $(BINDIR)
+       @echo Installing GUI event support to $(BINDIR)
 -      @$(INSTALLDIR) $(BINDIR)
-+      @echo Installing icewm-gnome to $(DESTDIR)$(BINDIR)
 +      @$(INSTALLDIR) $(DESTDIR)$(BINDIR)
-       @for a in $(GNOMEFILES) ; do \
+       @for a in $(GUIEVENTSFILES) ; do \
 -            $(INSTALLBIN) $$a $(BINDIR); \
 +            $(INSTALLBIN) $$a $(DESTDIR)$(BINDIR); \
          done
-diff -Nru icewm-1.0.5/configure.in icewm-1.0.5.new/configure.in
---- icewm-1.0.5/configure.in   Tue Dec 12 22:45:28 2000
-+++ icewm-1.0.5.new/configure.in       Sat Dec 16 04:35:10 2000
+ 
+ install-gnome: gnome
+       @echo ------------------------------------------
+-      @echo Installing icewm-gnome to $(WMPROPDIR)
+-      @$(INSTALLDIR) $(WMPROPDIR)
+-      @$(INSTALLLIB) lib/IceWM.desktop $(WMPROPDIR)
++      @echo Installing icewm-gnome to $(DESTDIR)$(WMPROPDIR)
++      @$(INSTALLDIR) $(DESTDIR)$(WMPROPDIR)
++      @$(INSTALLLIB) lib/IceWM.desktop $(DESTDIR)$(WMPROPDIR)
+diff -urN icewm-1.0.6.org/configure.in icewm-1.0.6/configure.in
+--- icewm-1.0.6.org/configure.in       Wed Jan 17 19:04:10 2001
++++ icewm-1.0.6/configure.in   Wed Jan 17 19:06:15 2001
 @@ -66,7 +66,7 @@
  AC_FUNC_SELECT_ARGTYPES
  
@@ -90,16 +100,16 @@ diff -Nru icewm-1.0.5/configure.in icewm-1.0.5.new/configure.in
  
  dnl Checking for X11
  AC_PATH_XTRA
-diff -Nru icewm-1.0.5/po/Makefile icewm-1.0.5.new/po/Makefile
---- icewm-1.0.5/po/Makefile    Sat Dec 16 04:34:56 2000
-+++ icewm-1.0.5.new/po/Makefile        Sat Dec 16 04:34:36 2000
-@@ -20,8 +20,8 @@
+diff -urN icewm-1.0.6.org/po/Makefile icewm-1.0.6/po/Makefile
+--- icewm-1.0.6.org/po/Makefile        Wed Jan 17 19:04:10 2001
++++ icewm-1.0.6/po/Makefile    Wed Jan 17 20:05:49 2001
+@@ -23,8 +23,8 @@
          LANG=`echo $$c|sed -e 's/.mo//'` ; \
-         MSGDIR="$(LOCALEDIR)/$$LANG/LC_MESSAGES"; \
+         MSGDIR="$(LOCDIR)/$$LANG/LC_MESSAGES"; \
          echo Installing language: $$LANG ; \
 -        $(INSTALLDIR) $$MSGDIR; \
 -        $(INSTALLBIN) $$c $$MSGDIR/$(PACKAGE).mo; \
-+        $(INSTALLDIR) $(DESTDiR)$$MSGDIR; \
++        $(INSTALLDIR) $(DESTDIR)$$MSGDIR; \
 +        $(INSTALLBIN) $$c $(DESTDIR)$$MSGDIR/$(PACKAGE).mo; \
        done