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

--- icewm-1.0.7/po/Makefile.orig	Sun Mar 25 01:54:17 2001
+++ icewm-1.0.7/po/Makefile	Sun Mar 25 01:53:08 2001
@@ -23,8 +23,8 @@
 	  LANG=`echo $$c|sed -e 's/.mo//'` ; \
 	  MSGDIR="$(LOCDIR)/$$LANG/LC_MESSAGES"; \
 	  echo Installing language: $$LANG ; \
-	  $(INSTALLDIR) $$MSGDIR; \
-	  $(INSTALLLIB) $$c $$MSGDIR/$(PACKAGE).mo; \
+	  $(INSTALLDIR) $(DESTDIR)$$MSGDIR; \
+	  $(INSTALLLIB) $$c $(DESTDIR)$$MSGDIR/$(PACKAGE).mo; \
 	done
 
 clean:
--- icewm-1.0.7/Makefile.in.orig	Sun Mar 25 01:39:53 2001
+++ icewm-1.0.7/Makefile.in	Sun Mar 25 01:46:49 2001
@@ -62,37 +62,37 @@
 # Makefile TABS *SUCK*
 install-base: base
 	@echo ------------------------------------------
-	@echo Installing icewm to $(BINDIR)
-	@$(INSTALLDIR) $(BINDIR)
+	@echo Installing icewm to $(DESTDIR)$(BINDIR)
+	@$(INSTALLDIR) $(DESTDIR)$(BINDIR)
 	@for app in $(BINFILES) ; do \
-            $(INSTALLBIN) $$app $(BINDIR); \
+            $(INSTALLBIN) $$app $(DESTDIR)$(BINDIR); \
         done
-	@echo Installing defaults, icons and themes to $(LIBDIR)
-	@$(INSTALLDIR) $(LIBDIR)
-	@$(INSTALLDIR) $(CFGDIR)
+	@echo Installing defaults, icons and themes to $(DESTDIR)$(LIBDIR)
+	@$(INSTALLDIR) $(DESTDIR)$(LIBDIR)
+	@$(INSTALLDIR) $(DESTDIR)$(CFGDIR)
 	@for lib in $(LIBFILES) ; do \
-            $(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; \
         done
 	@for theme in $(THEMES) ; do \
             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; \
             done; \
             for config in lib/themes/$$theme/*.theme ; do \
-                $(INSTALLLIB) $$config $(LIBDIR)/themes/$$theme; \
+                $(INSTALLLIB) $$config $(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; \
                     done;\
                 fi;\
             done;\
@@ -101,9 +101,9 @@
 
 install-docs: docs $(LSM)
 	@echo ------------------------------------------
-	@$(INSTALLDIR) $(DOCDIR)/icewm-$(VERSION)
-	cp $(DOCFILES) $(DOCDIR)/icewm-$(VERSION)
-	cp -r doc $(DOCDIR)/icewm-$(VERSION)
+	@$(INSTALLDIR) $(DESTDIR)$(DOCDIR)/icewm-$(VERSION)
+	cp $(DOCFILES) $(DESTDIR)$(DOCDIR)/icewm-$(VERSION)
+	cp -r doc $(DESTDIR)$(DOCDIR)/icewm-$(VERSION)
 
 install-nls: nls
 	@echo ------------------------------------------
@@ -111,12 +111,12 @@
 
 install-%: %
 	@echo ------------------------------------------
-	@echo Installing $* to $(BINDIR)
-	@$(INSTALLDIR) $(BINDIR)
-	@$(INSTALLBIN) src/$* $(BINDIR)
+	@echo Installing $* to $(DESTDIR)$(BINDIR)
+	@$(INSTALLDIR) $(DESTDIR)$(BINDIR)
+	@$(INSTALLBIN) src/$* $(DESTDIR)$(BINDIR)
 
 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)
--- icewm-1.0.7/configure.in.orig	Sun Mar 25 01:49:37 2001
+++ icewm-1.0.7/configure.in	Sun Mar 25 01:52:02 2001
@@ -66,7 +66,7 @@
 AC_FUNC_SELECT_ARGTYPES
 
 dnl Configuring features
-TARGETS='base docs'
+TARGETS='base'
 
 dnl Checking for X11
 AC_PATH_XTRA
Commit	Line	Data
c62f2d36 PG	1	--- icewm-1.0.7/po/Makefile.orig Sun Mar 25 01:54:17 2001
	2	+++ icewm-1.0.7/po/Makefile Sun Mar 25 01:53:08 2001
	3	@@ -23,8 +23,8 @@
	4	LANG=`echo $$c\|sed -e 's/.mo//'` ; \
	5	MSGDIR="$(LOCDIR)/$$LANG/LC_MESSAGES"; \
	6	echo Installing language: $$LANG ; \
	7	- $(INSTALLDIR) $$MSGDIR; \
	8	- $(INSTALLLIB) $$c $$MSGDIR/$(PACKAGE).mo; \
	9	+ $(INSTALLDIR) $(DESTDIR)$$MSGDIR; \
	10	+ $(INSTALLLIB) $$c $(DESTDIR)$$MSGDIR/$(PACKAGE).mo; \
	11	done
	12
	13	clean:
	14	--- icewm-1.0.7/Makefile.in.orig Sun Mar 25 01:39:53 2001
	15	+++ icewm-1.0.7/Makefile.in Sun Mar 25 01:46:49 2001
	16	@@ -62,37 +62,37 @@
4d0661a9	17	# Makefile TABS SUCK
	18	install-base: base
	19	@echo ------------------------------------------
	20	- @echo Installing icewm to $(BINDIR)
	21	- @$(INSTALLDIR) $(BINDIR)
	22	+ @echo Installing icewm to $(DESTDIR)$(BINDIR)
	23	+ @$(INSTALLDIR) $(DESTDIR)$(BINDIR)
ec15105f AM	24	@for app in $(BINFILES) ; do \
ec15105f AM	25	- $(INSTALLBIN) $$app $(BINDIR); \
4d0661a9	26	+ $(INSTALLBIN) $$app $(DESTDIR)$(BINDIR); \
	27	done
	28	- @echo Installing defaults, icons and themes to $(LIBDIR)
	29	- @$(INSTALLDIR) $(LIBDIR)
473dc2a8	30	- @$(INSTALLDIR) $(CFGDIR)
4d0661a9	31	+ @echo Installing defaults, icons and themes to $(DESTDIR)$(LIBDIR)
4d0661a9	32	+ @$(INSTALLDIR) $(DESTDIR)$(LIBDIR)
473dc2a8	33	+ @$(INSTALLDIR) $(DESTDIR)$(CFGDIR)
4d0661a9	34	@for lib in $(LIBFILES) ; do \
	35	- $(INSTALLLIB) $$lib $(LIBDIR); \
	36	+ $(INSTALLLIB) $$lib $(DESTDIR)$(LIBDIR); \
	37	done
	38	@for xpmdir in $(XPMDIRS) ; do \
	39	- $(INSTALLDIR) $(LIBDIR)/$$xpmdir; \
	40	+ $(INSTALLDIR) $(DESTDIR)$(LIBDIR)/$$xpmdir; \
	41	for icon in lib/$$xpmdir/*.xpm ; do \
	42	- $(INSTALLLIB) $$icon $(LIBDIR)/$$xpmdir; \
	43	+ $(INSTALLLIB) $$icon $(DESTDIR)$(LIBDIR)/$$xpmdir; \
	44	done; \
	45	done
	46	@for theme in $(THEMES) ; do \
	47	echo Installing theme: $$theme; \
	48	- $(INSTALLDIR) $(LIBDIR)/themes/$$theme; \
	49	+ $(INSTALLDIR) $(DESTDIR)$(LIBDIR)/themes/$$theme; \
	50	for pixmap in lib/themes/$$theme/*.xpm ; do \
	51	- $(INSTALLLIB) $$pixmap $(LIBDIR)/themes/$$theme; \
	52	+ $(INSTALLLIB) $$pixmap $(DESTDIR)$(LIBDIR)/themes/$$theme; \
	53	done; \
	54	for config in lib/themes/$$theme/*.theme ; do \
	55	- $(INSTALLLIB) $$config $(LIBDIR)/themes/$$theme; \
	56	+ $(INSTALLLIB) $$config $(DESTDIR)$(LIBDIR)/themes/$$theme; \
	57	done; \
	58	for l in $(XPMDIRS) ; do \
	59	if [ -d lib/themes/$$theme/$$l ] ; then \
	60	- $(INSTALLDIR) $(LIBDIR)/themes/$$theme/$$l; \
	61	+ $(INSTALLDIR) $(DESTDIR)$(LIBDIR)/themes/$$theme/$$l; \
	62	for f in lib/themes/$$theme/$$l/* ; do \
	63	- $(INSTALLLIB) $$f $(LIBDIR)/themes/$$theme/$$l; \
	64	+ $(INSTALLLIB) $$f $(DESTDIR)$(LIBDIR)/themes/$$theme/$$l; \
	65	done;\
	66	fi;\
	67	done;\
c62f2d36	68	@@ -101,9 +101,9 @@
473dc2a8 AM	69
	70	install-docs: docs $(LSM)
	71	@echo ------------------------------------------
4d0661a9	72	- @$(INSTALLDIR) $(DOCDIR)/icewm-$(VERSION)
	73	- cp $(DOCFILES) $(DOCDIR)/icewm-$(VERSION)
	74	- cp -r doc $(DOCDIR)/icewm-$(VERSION)
473dc2a8 AM	75	+ @$(INSTALLDIR) $(DESTDIR)$(DOCDIR)/icewm-$(VERSION)
	76	+ cp $(DOCFILES) $(DESTDIR)$(DOCDIR)/icewm-$(VERSION)
	77	+ cp -r doc $(DESTDIR)$(DOCDIR)/icewm-$(VERSION)
4d0661a9	78
	79	install-nls: nls
	80	@echo ------------------------------------------
c62f2d36	81	@@ -111,12 +111,12 @@
4d0661a9	82
c62f2d36	83	install-%: %
4d0661a9	84	@echo ------------------------------------------
c62f2d36	85	- @echo Installing $* to $(BINDIR)
4d0661a9	86	- @$(INSTALLDIR) $(BINDIR)
c62f2d36 PG	87	- @$(INSTALLBIN) src/$* $(BINDIR)
c62f2d36 PG	88	+ @echo Installing $* to $(DESTDIR)$(BINDIR)
4d0661a9	89	+ @$(INSTALLDIR) $(DESTDIR)$(BINDIR)
c62f2d36	90	+ @$(INSTALLBIN) src/$* $(DESTDIR)$(BINDIR)
473dc2a8 AM	91
	92	install-gnome: gnome
	93	@echo ------------------------------------------
	94	- @echo Installing icewm-gnome to $(WMPROPDIR)
	95	- @$(INSTALLDIR) $(WMPROPDIR)
	96	- @$(INSTALLLIB) lib/IceWM.desktop $(WMPROPDIR)
	97	+ @echo Installing icewm-gnome to $(DESTDIR)$(WMPROPDIR)
	98	+ @$(INSTALLDIR) $(DESTDIR)$(WMPROPDIR)
	99	+ @$(INSTALLLIB) lib/IceWM.desktop $(DESTDIR)$(WMPROPDIR)
c62f2d36 PG	100	--- icewm-1.0.7/configure.in.orig Sun Mar 25 01:49:37 2001
c62f2d36 PG	101	+++ icewm-1.0.7/configure.in Sun Mar 25 01:52:02 2001
4d0661a9	102	@@ -66,7 +66,7 @@
	103	AC_FUNC_SELECT_ARGTYPES
	104
	105	dnl Configuring features
	106	-TARGETS='base docs'
	107	+TARGETS='base'
	108
	109	dnl Checking for X11
	110	AC_PATH_XTRA
4d0661a9	111
c62f2d36	112