- typos, encoding fixes, added vi-line, etc.

[packages/icewm.git] / icewm-DESTDIR.patch

diff --git a/icewm-DESTDIR.patch b/icewm-DESTDIR.patch
index c506fb5bdf149c04577ed1ea322a876cc0a2ab71..3d83d41de92e31f272a951970e26ab06c40dddf2 100644 (file)
--- a/icewm-DESTDIR.patch
+++ b/icewm-DESTDIR.patch
@@ -1,11 +1,11 @@
---- 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
+--- ./po/Makefile.org  Thu Oct 11 02:21:25 2001
++++ ./po/Makefile      Thu Oct 11 02:22:19 2001
 @@ -18,10 +18,10 @@
  all: $(MOFILES)
  
  install: all
--      @echo Installing localized messages in $(LOCDIR)
-+      @echo Installing localized messages in $(DESTDIR)$(LOCDIR)
+-      @echo Installing message catalogues in $(LOCDIR)
++      @echo Installing message catalogues in $(DESTDIR)$(LOCDIR)
        @for c in $(MOFILES); do \
          LANG=`echo $$c|sed -e 's/.mo//'` ; \
 -        MSGDIR="$(LOCDIR)/$$LANG/LC_MESSAGES"; \
@@ -13,28 +13,24 @@
          echo Installing language: $$LANG ; \
          $(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'`|"
- 
--# Makefile TABS *SUCK*
-+
+--- ./Makefile.in.org  Thu Oct 11 02:22:32 2001
++++ ./Makefile.in      Thu Oct 11 02:27:57 2001
+@@ -70,57 +70,57 @@
+ # Makefile TABS *SUCK*
  install-base: base
        @echo ------------------------------------------
--      @echo Installing icewm in $(BINDIR)
+-      @echo "Installing binaries in $(BINDIR)"
 -      @$(INSTALLDIR) $(BINDIR)
-+      @echo Installing icewm in $(DESTDIR)$(BINDIR)
++      @echo "Installing binaries in $(DESTDIR)$(BINDIR)"
 +      @$(INSTALLDIR) $(DESTDIR)$(BINDIR)
        @for app in $(BINFILES) ; do \
 -            $(INSTALLBIN) "$$app" $(BINDIR); \
 +            $(INSTALLBIN) "$$app" $(DESTDIR)$(BINDIR); \
          done
--      @echo Installing defaults, icons and themes in $(LIBDIR)
+-      @echo "Installing defaults, icons and themes in $(LIBDIR)"
 -      @$(INSTALLDIR) $(LIBDIR)
 -      @$(INSTALLDIR) $(CFGDIR)
-+      @echo Installing defaults, icons and themes in $(DESTDIR)$(LIBDIR)
++      @echo "Installing defaults, icons and themes in $(DESTDIR)$(LIBDIR)"
 +      @$(INSTALLDIR) $(DESTDIR)$(LIBDIR)
 +      @$(INSTALLDIR) $(DESTDIR)$(CFGDIR)
        @for lib in $(LIBFILES) ; do \
@@ -51,8 +47,9 @@
                done; \
            fi; \
          done
+       @echo ------------------------------------------
        @for theme in $(THEMES) ; do \
-             echo Installing theme: $$theme; \
+             echo "Installing theme: $$theme"; \
 -            $(INSTALLDIR) $(LIBDIR)/themes/$$theme; \
 +            $(INSTALLDIR) $(DESTDIR)$(LIBDIR)/themes/$$theme; \
              for pixmap in lib/themes/$$theme/*.xpm; do \
@@ -69,9 +66,10 @@
 +                  $(INSTALLLIB) "$$fontfile" $(DESTDIR)$(LIBDIR)/themes/$$theme; \
                done; \
                if test -x "$(MKFONTDIR)"; then \
--                cd "$(LIBDIR)/themes/$$theme"; \
-+                cd "$(DESTDIR)$(LIBDIR)/themes/$$theme"; \
+-                cwd=$$PWD; cd "$(LIBDIR)/themes/$$theme"; \
++                cwd=$$PWD; cd "$(DESTDIR)$(LIBDIR)/themes/$$theme"; \
                  $(MKFONTDIR); \
+                 cd $$cwd; \
                else \
                  echo "WARNING: A dummy file has been copied to"; \
 -                echo "         $(LIBDIR)/themes/$$theme/fonts.dir"; \
@@ -94,35 +92,24 @@
                      done;\
                  fi;\
              done;\
-         done
-       @#for a in $(ETCFILES) ; do $(INSTALLETC) "$$a" $(CFGDIR) ; done
+@@ -130,11 +130,11 @@
  
--install-docs: docs $(LSM)
-+
+ install-docs: docs $(LSM)
        @echo ------------------------------------------
 -      @rm -fr $(DOCDIR)/icewm-$(VERSION)
 -      @$(INSTALLDIR) $(DOCDIR)/icewm-$(VERSION)
 -      @echo Installing documentation in $(DOCDIR); \
 -      cp $(DOCFILES) $(DOCDIR)/icewm-$(VERSION); \
--      cp -r doc/*.{sgml,html} $(DOCDIR)/icewm-$(VERSION)
+-      cp -r doc/*.sgml doc/*.html $(DOCDIR)/icewm-$(VERSION)
 +      @rm -fr $(DESTDIR)$(DOCDIR)/icewm-$(VERSION)
 +      @$(INSTALLDIR) $(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
++      cp -r doc/*.sgml doc/*.html $(DESTDIR)$(DOCDIR)/icewm-$(VERSION)
        @echo ------------------------------------------
-@@ -133,12 +133,12 @@
  
- install-%: %
-       @echo ------------------------------------------
--      @echo Installing $* in $(BINDIR)
--      @$(INSTALLDIR) $(BINDIR)
--      @$(INSTALLBIN) src/$* $(BINDIR)
-+      @echo Installing $* in $(DESTDIR)$(BINDIR)
-+      @$(INSTALLDIR) $(DESTDIR)$(BINDIR)
-+      @$(INSTALLBIN) src/$* $(DESTDIR)$(BINDIR)
+ install-nls: nls
+@@ -144,7 +144,7 @@
  
  install-gnome: gnome
        @echo ------------------------------------------
@@ -132,14 +119,15 @@
 +      @echo Installing icewm-gnome in $(DESTDIR)$(WMPROPDIR)
 +      @$(INSTALLDIR) $(DESTDIR)$(WMPROPDIR)
 +      @$(INSTALLLIB) lib/IceWM.desktop $(DESTDIR)$(WMPROPDIR)
---- 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 @@
+       @echo ------------------------------------------
+--- ./configure.in.org Thu Oct 11 02:28:10 2001
++++ ./configure.in     Thu Oct 11 02:28:32 2001
+@@ -83,7 +83,7 @@
  AC_FUNC_SELECT_ARGTYPES
  
  dnl Configuring features
 -TARGETS='base docs'
 +TARGETS='base'
+ APPLICATIONS='genpref icewm icesh icewmhint icewmbg'
  
  dnl Checking for X11
- AC_PATH_XTRA