icewm-DESTDIR.patch

   1 diff -Nru icewm-1.0.5/Makefile.in icewm-1.0.5.new/Makefile.in
   2 --- icewm-1.0.5/Makefile.in     Sat Dec 16 04:34:56 2000
   3 +++ icewm-1.0.5.new/Makefile.in Sat Dec 16 04:34:36 2000
   4 @@ -62,57 +62,51 @@
   5  # Makefile TABS *SUCK*
   6  install-base: base
   7         @echo ------------------------------------------
   8 -       @echo Installing icewm to $(BINDIR)
   9 -       @$(INSTALLDIR) $(BINDIR)
  10 +       @echo Installing icewm to $(DESTDIR)$(BINDIR)
  11 +       @$(INSTALLDIR) $(DESTDIR)$(BINDIR)
  12         @for app in $(BINFILES) ; do \
  13 -            $(INSTALLBIN) $$app $(BINDIR); \
  14 +            $(INSTALLBIN) $$app $(DESTDIR)$(BINDIR); \
  15          done
  16 -       @echo Installing defaults, icons and themes to $(LIBDIR)
  17 -       @$(INSTALLDIR) $(LIBDIR)
  18 -       @$(INSTALLDIR) $(ETCDIR)
  19 +       @echo Installing defaults, icons and themes to $(DESTDIR)$(LIBDIR)
  20 +       @$(INSTALLDIR) $(DESTDIR)$(LIBDIR)
  21 +       @$(INSTALLDIR) $(DESTDIR)$(ETCDIR)
  22         @for lib in $(LIBFILES) ; do \
  23 -            $(INSTALLLIB) $$lib $(LIBDIR); \
  24 +            $(INSTALLLIB) $$lib $(DESTDIR)$(LIBDIR); \
  25          done
  26         @for xpmdir in $(XPMDIRS) ; do \
  27 -            $(INSTALLDIR) $(LIBDIR)/$$xpmdir; \
  28 +            $(INSTALLDIR) $(DESTDIR)$(LIBDIR)/$$xpmdir; \
  29              for icon in lib/$$xpmdir/*.xpm ; do \
  30 -                $(INSTALLLIB) $$icon $(LIBDIR)/$$xpmdir; \
  31 +                $(INSTALLLIB) $$icon $(DESTDIR)$(LIBDIR)/$$xpmdir; \
  32              done; \
  33          done
  34         @for theme in $(THEMES) ; do \
  35              echo Installing theme: $$theme; \
  36 -            $(INSTALLDIR) $(LIBDIR)/themes/$$theme; \
  37 +            $(INSTALLDIR) $(DESTDIR)$(LIBDIR)/themes/$$theme; \
  38              for pixmap in lib/themes/$$theme/*.xpm ; do \
  39 -                $(INSTALLLIB) $$pixmap $(LIBDIR)/themes/$$theme; \
  40 +                $(INSTALLLIB) $$pixmap $(DESTDIR)$(LIBDIR)/themes/$$theme; \
  41              done; \
  42              for config in lib/themes/$$theme/*.theme ; do \
  43 -                $(INSTALLLIB) $$config $(LIBDIR)/themes/$$theme; \
  44 +                $(INSTALLLIB) $$config $(DESTDIR)$(LIBDIR)/themes/$$theme; \
  45              done; \
  46              for l in $(XPMDIRS) ; do \
  47                  if [ -d lib/themes/$$theme/$$l ] ; then \
  48 -                    $(INSTALLDIR) $(LIBDIR)/themes/$$theme/$$l; \
  49 +                    $(INSTALLDIR) $(DESTDIR)$(LIBDIR)/themes/$$theme/$$l; \
  50                      for f in lib/themes/$$theme/$$l/* ; do \
  51 -                        $(INSTALLLIB) $$f $(LIBDIR)/themes/$$theme/$$l; \
  52 +                        $(INSTALLLIB) $$f $(DESTDIR)$(LIBDIR)/themes/$$theme/$$l; \
  53                      done;\
  54                  fi;\
  55              done;\
  56          done
  57 -       @#for a in $(ETCFILES) ; do $(INSTALLETC) $$a $(ETCDIR) ; done
  58 -
  59 -install-docs: docs $(LSM)
  60 -       @echo ------------------------------------------
  61 -       @$(INSTALLDIR) $(DOCDIR)/icewm-$(VERSION)
  62 -       cp $(DOCFILES) $(DOCDIR)/icewm-$(VERSION)
  63 -       cp -r doc $(DOCDIR)/icewm-$(VERSION)
  64 +       @#for a in $(ETCFILES) ; do $(INSTALLETC) $$a $(DESTDIR)$(ETCDIR) ; done
  65
  66  install-nls: nls
  67         @echo ------------------------------------------
  68 -       @cd po ; ${MAKE} install
  69 +       @cd po ; ${MAKE} DESTDIR=$(DESTDIR) install
  70
  71  install-gnome: gnome
  72         @echo ------------------------------------------
  73 -       @echo Installing icewm-gnome to $(BINDIR)
  74 -       @$(INSTALLDIR) $(BINDIR)
  75 +       @echo Installing icewm-gnome to $(DESTDIR)$(BINDIR)
  76 +       @$(INSTALLDIR) $(DESTDIR)$(BINDIR)
  77         @for a in $(GNOMEFILES) ; do \
  78 -            $(INSTALLBIN) $$a $(BINDIR); \
  79 +            $(INSTALLBIN) $$a $(DESTDIR)$(BINDIR); \
  80          done
  81 diff -Nru icewm-1.0.5/configure.in icewm-1.0.5.new/configure.in
  82 --- icewm-1.0.5/configure.in    Tue Dec 12 22:45:28 2000
  83 +++ icewm-1.0.5.new/configure.in        Sat Dec 16 04:35:10 2000
  84 @@ -66,7 +66,7 @@
  85  AC_FUNC_SELECT_ARGTYPES
  86
  87  dnl Configuring features
  88 -TARGETS='base docs'
  89 +TARGETS='base'
  90
  91  dnl Checking for X11
  92  AC_PATH_XTRA
  93 diff -Nru icewm-1.0.5/po/Makefile icewm-1.0.5.new/po/Makefile
  94 --- icewm-1.0.5/po/Makefile     Sat Dec 16 04:34:56 2000
  95 +++ icewm-1.0.5.new/po/Makefile Sat Dec 16 04:34:36 2000
  96 @@ -20,8 +20,8 @@
  97           LANG=`echo $$c|sed -e 's/.mo//'` ; \
  98           MSGDIR="$(LOCALEDIR)/$$LANG/LC_MESSAGES"; \
  99           echo Installing language: $$LANG ; \
 100 -         $(INSTALLDIR) $$MSGDIR; \
 101 -         $(INSTALLBIN) $$c $$MSGDIR/$(PACKAGE).mo; \
 102 +         $(INSTALLDIR) $(DESTDiR)$$MSGDIR; \
 103 +         $(INSTALLBIN) $$c $(DESTDIR)$$MSGDIR/$(PACKAGE).mo; \
 104         done
 105
 106  clean: