-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 @@
+--- ./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 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"; \
++ MSGDIR="$(DESTDIR)$(LOCDIR)/$$LANG/LC_MESSAGES"; \
+ echo Installing language: $$LANG ; \
+ $(INSTALLDIR) $$MSGDIR; \
+ $(INSTALLLIB) $$c $$MSGDIR/$(PACKAGE).mo; \
+--- ./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 to $(BINDIR)
+- @echo "Installing binaries in $(BINDIR)"
- @$(INSTALLDIR) $(BINDIR)
-+ @echo Installing icewm to $(DESTDIR)$(BINDIR)
++ @echo "Installing binaries 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) $(ETCDIR)
-+ @echo Installing defaults, icons and themes to $(DESTDIR)$(LIBDIR)
+- @$(INSTALLDIR) $(CFGDIR)
++ @echo "Installing defaults, icons and themes in $(DESTDIR)$(LIBDIR)"
+ @$(INSTALLDIR) $(DESTDIR)$(LIBDIR)
-+ @$(INSTALLDIR) $(DESTDIR)$(ETCDIR)
++ @$(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
+ @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 \
-- $(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 \
+- 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"; \
++ 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;\
- done
-- @#for a in $(ETCFILES) ; do $(INSTALLETC) $$a $(ETCDIR) ; done
--
--install-docs: docs $(LSM)
-- @echo ------------------------------------------
+@@ -130,11 +130,11 @@
+
+ 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)
-+ @#for a in $(ETCFILES) ; do $(INSTALLETC) $$a $(DESTDIR)$(ETCDIR) ; done
+- @echo Installing documentation in $(DOCDIR); \
+- cp $(DOCFILES) $(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 doc/*.html $(DESTDIR)$(DOCDIR)/icewm-$(VERSION)
+ @echo ------------------------------------------
install-nls: nls
- @echo ------------------------------------------
-- @cd po ; ${MAKE} install
-+ @cd po ; ${MAKE} DESTDIR=$(DESTDIR) install
+@@ -144,7 +144,7 @@
install-gnome: gnome
@echo ------------------------------------------
-- @echo Installing icewm-gnome to $(BINDIR)
-- @$(INSTALLDIR) $(BINDIR)
-+ @echo Installing icewm-gnome to $(DESTDIR)$(BINDIR)
-+ @$(INSTALLDIR) $(DESTDIR)$(BINDIR)
- @for a in $(GNOMEFILES) ; 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
-@@ -66,7 +66,7 @@
+- @echo Installing icewm-gnome in $(WMPROPDIR)
+- @$(INSTALLDIR) $(WMPROPDIR)
+- @$(INSTALLLIB) lib/IceWM.desktop $(WMPROPDIR)
++ @echo Installing icewm-gnome in $(DESTDIR)$(WMPROPDIR)
++ @$(INSTALLDIR) $(DESTDIR)$(WMPROPDIR)
++ @$(INSTALLLIB) lib/IceWM.desktop $(DESTDIR)$(WMPROPDIR)
+ @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
-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 @@
- LANG=`echo $$c|sed -e 's/.mo//'` ; \
- MSGDIR="$(LOCALEDIR)/$$LANG/LC_MESSAGES"; \
- echo Installing language: $$LANG ; \
-- $(INSTALLDIR) $$MSGDIR; \
-- $(INSTALLBIN) $$c $$MSGDIR/$(PACKAGE).mo; \
-+ $(INSTALLDIR) $(DESTDiR)$$MSGDIR; \
-+ $(INSTALLBIN) $$c $(DESTDIR)$$MSGDIR/$(PACKAGE).mo; \
- done
-
- clean:
projects / packages / icewm.git / blobdiff