icewm-DESTDIR.patch

   1 --- icewm-1.0.8/po/Makefile.orig        Fri Apr 27 20:09:30 2001
   2 +++ icewm-1.0.8/po/Makefile     Fri Apr 27 20:10:19 2001
   3 @@ -18,10 +18,10 @@
   4  all: $(MOFILES)
   5
   6  install: all
   7 -       @echo Installing localized messages in $(LOCDIR)
   8 +       @echo Installing localized messages in $(DESTDIR)$(LOCDIR)
   9         @for c in $(MOFILES); do \
  10           LANG=`echo $$c|sed -e 's/.mo//'` ; \
  11 -         MSGDIR="$(LOCDIR)/$$LANG/LC_MESSAGES"; \
  12 +         MSGDIR="$(DESTDIR)$(LOCDIR)/$$LANG/LC_MESSAGES"; \
  13           echo Installing language: $$LANG ; \
  14           $(INSTALLDIR) $$MSGDIR; \
  15           $(INSTALLLIB) $$c $$MSGDIR/$(PACKAGE).mo; \
  16 --- icewm-1.0.8/Makefile.in.orig        Fri Apr 27 20:10:53 2001
  17 +++ icewm-1.0.8/Makefile.in     Fri Apr 27 20:18:10 2001
  18 @@ -64,56 +64,56 @@
  19  # Makefile TABS *SUCK*
  20  install-base: base
  21         @echo ------------------------------------------
  22 -       @echo Installing icewm in $(BINDIR)
  23 -       @$(INSTALLDIR) $(BINDIR)
  24 +       @echo Installing icewm in $(DESTDIR)$(BINDIR)
  25 +       @$(INSTALLDIR) $(DESTDIR)$(BINDIR)
  26         @for app in $(BINFILES) ; do \
  27 -            $(INSTALLBIN) "$$app" $(BINDIR); \
  28 +            $(INSTALLBIN) "$$app" $(DESTDIR)$(BINDIR); \
  29          done
  30 -       @echo Installing defaults, icons and themes in $(LIBDIR)
  31 -       @$(INSTALLDIR) $(LIBDIR)
  32 -       @$(INSTALLDIR) $(CFGDIR)
  33 +       @echo Installing defaults, icons and themes in $(DESTDIR)$(LIBDIR)
  34 +       @$(INSTALLDIR) $(DESTDIR)$(LIBDIR)
  35 +       @$(INSTALLDIR) $(DESTDIR)$(CFGDIR)
  36         @for lib in $(LIBFILES) ; do \
  37 -            $(INSTALLLIB) "$$lib" $(LIBDIR); \
  38 +            $(INSTALLLIB) "$$lib" $(DESTDIR)$(LIBDIR); \
  39          done
  40         @for xpmdir in $(XPMDIRS); do \
  41             if test -d lib/$$xpmdir; then \
  42 -               $(INSTALLDIR) $(LIBDIR)/$$xpmdir; \
  43 +               $(INSTALLDIR) $(DESTDIR)$(LIBDIR)/$$xpmdir; \
  44                 for pixmap in lib/$$xpmdir/*.xpm ; do \
  45 -                   $(INSTALLLIB) "$$pixmap" $(LIBDIR)/$$xpmdir; \
  46 +                   $(INSTALLLIB) "$$pixmap" $(DESTDIR)$(LIBDIR)/$$xpmdir; \
  47                 done; \
  48             fi; \
  49          done
  50         @for theme in $(THEMES) ; do \
  51              echo Installing theme: $$theme; \
  52 -            $(INSTALLDIR) $(LIBDIR)/themes/$$theme; \
  53 +            $(INSTALLDIR) $(DESTDIR)$(LIBDIR)/themes/$$theme; \
  54              for pixmap in lib/themes/$$theme/*.xpm; do \
  55 -                $(INSTALLLIB) "$$pixmap" $(LIBDIR)/themes/$$theme; \
  56 +                $(INSTALLLIB) "$$pixmap" $(DESTDIR)$(LIBDIR)/themes/$$theme; \
  57              done; \
  58              for subtheme in lib/themes/$$theme/*.theme; do \
  59 -                $(INSTALLLIB) "$$subtheme" $(LIBDIR)/themes/$$theme; \
  60 +                $(INSTALLLIB) "$$subtheme" $(DESTDIR)$(LIBDIR)/themes/$$theme; \
  61              done; \
  62             if test -f lib/themes/$$theme/*.pcf; then \
  63                  for fontfile in lib/themes/$$theme/*.pcf; do \
  64 -                   $(INSTALLLIB) "$$fontfile" $(LIBDIR)/themes/$$theme; \
  65 +                   $(INSTALLLIB) "$$fontfile" $(DESTDIR)$(LIBDIR)/themes/$$theme; \
  66                 done; \
  67                 if test -x "$(MKFONTDIR)"; then \
  68 -                 pushd "$(LIBDIR)/themes/$$theme"; \
  69 +                 pushd "$(DESTDIR)$(LIBDIR)/themes/$$theme"; \
  70                   $(MKFONTDIR); \
  71                   popd; \
  72                 else \
  73                   echo "WARNING: A dummy file has been copied to"; \
  74 -                 echo "         $(LIBDIR)/themes/$$theme/fonts.dir"; \
  75 +                 echo "         $(DESTDIR)$(LIBDIR)/themes/$$theme/fonts.dir"; \
  76                   echo "         You better setup your path to point to mkfontdir or use the"; \
  77                   echo "         --with-mkfontdir option of the configure script."; \
  78 -                 $(INSTALLLIB) "lib/themes/$$theme/fonts.dir.default" \
  79 -                               "$(LIBDIR)/themes/$$theme/fonts.dir"; \
  80 +                 $(INSTALLLIB) "$(DESTDIR)lib/themes/$$theme/fonts.dir.default" \
  81 +                               "$(DESTDIR)$(LIBDIR)/themes/$$theme/fonts.dir"; \
  82                 fi; \
  83             fi; \
  84              for xpmdir in $(XPMDIRS) ; do \
  85                  if [ -d lib/themes/$$theme/$$xpmdir ] ; then \
  86 -                    $(INSTALLDIR) $(LIBDIR)/themes/$$theme/$$xpmdir; \
  87 +                    $(INSTALLDIR) $(DESTDIR)$(LIBDIR)/themes/$$theme/$$xpmdir; \
  88                      for f in lib/themes/$$theme/$$xpmdir/*.xpm ; do \
  89 -                        $(INSTALLLIB) "$$f" $(LIBDIR)/themes/$$theme/$$xpmdir; \
  90 +                        $(INSTALLLIB) "$$f" $(DESTDIR)$(LIBDIR)/themes/$$theme/$$xpmdir; \
  91                      done;\
  92                  fi;\
  93              done;\
  94 @@ -122,11 +122,11 @@
  95
  96  install-docs: docs $(LSM)
  97         @echo ------------------------------------------
  98 -       @rm -fr $(DOCDIR)/icewm-$(VERSION)
  99 -       @$(INSTALLDIR) $(DOCDIR)/icewm-$(VERSION)
 100 -       @echo Installing documentation in $(DOCDIR); \
 101 -       cp $(DOCFILES) $(DOCDIR)/icewm-$(VERSION); \
 102 -       cp -r doc/*.{sgml,html} $(DOCDIR)/icewm-$(VERSION)
 103 +       @rm -fr $(DESTDIR)$(DOCDIR)/icewm-$(VERSION)
 104 +       @$(INSTALLDIR) $(DESTDIR)$(DOCDIR)/icewm-$(VERSION)
 105 +       @echo Installing documentation in $(DESTDIR)$(DOCDIR); \
 106 +       cp $(DOCFILES) $(DESTDIR)$(DOCDIR)/icewm-$(VERSION); \
 107 +       cp -r doc/*.{sgml,html} $(DESTDIR)$(DOCDIR)/icewm-$(VERSION)
 108
 109  install-nls: nls
 110         @echo ------------------------------------------
 111 @@ -134,12 +134,12 @@
 112
 113  install-%: %
 114         @echo ------------------------------------------
 115 -       @echo Installing $* in $(BINDIR)
 116 -       @$(INSTALLDIR) $(BINDIR)
 117 -       @$(INSTALLBIN) src/$* $(BINDIR)
 118 +       @echo Installing $* in $(DESTDIR)$(BINDIR)
 119 +       @$(INSTALLDIR) $(DESTDIR)$(BINDIR)
 120 +       @$(INSTALLBIN) src/$* $(DESTDIR)$(BINDIR)
 121
 122  install-gnome: gnome
 123         @echo ------------------------------------------
 124 -       @echo Installing icewm-gnome in $(WMPROPDIR)
 125 -       @$(INSTALLDIR) $(WMPROPDIR)
 126 -       @$(INSTALLLIB) lib/IceWM.desktop $(WMPROPDIR)
 127 +       @echo Installing icewm-gnome in $(DESTDIR)$(WMPROPDIR)
 128 +       @$(INSTALLDIR) $(DESTDIR)$(WMPROPDIR)
 129 +       @$(INSTALLLIB) lib/IceWM.desktop $(DESTDIR)$(WMPROPDIR)
 130 --- icewm-1.0.8/configure.in.orig       Fri Apr 27 20:18:31 2001
 131 +++ icewm-1.0.8/configure.in    Fri Apr 27 20:19:13 2001
 132 @@ -75,7 +75,7 @@
 133  AC_FUNC_SELECT_ARGTYPES
 134
 135  dnl Configuring features
 136 -TARGETS='base docs'
 137 +TARGETS='base'
 138
 139  dnl Checking for X11
 140  AC_PATH_XTRA