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

diff -ruN bluefish-0.9.orig/Makefile.in bluefish-0.9/Makefile.in
--- bluefish-0.9.orig/Makefile.in	Wed Feb 19 23:39:25 2003
+++ bluefish-0.9/Makefile.in	Wed Feb 19 23:45:25 2003
@@ -29,7 +29,7 @@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 datadir=@datadir@
-pkgdatadir=$(datadir)/$(PACKAGE)
+pkgdatadir=$(DESTDIR)/$(datadir)/$(PACKAGE)
 pixmapsdir=@prefix@/share/pixmaps
 
 INSTALL = @INSTALL@
@@ -64,12 +64,12 @@
 	rm -f *.orig *.rej
 
 install: src/bluefish
-	pkgdatadir=@pkgdatadir@
+	pkgdatadir=$(DESTDIR)/@pkgdatadir@
 	$(INSTALL_DIR) $(pkgdatadir)
 	$(INSTALL_DATA) images/bluefish_splash.png $(pkgdatadir)
 	@cd icons/ && $(MAKE) install
 	if [ -d $(iconpath) ]; then \
-		$(INSTALL_DATA) inline_images/bluefish_icon1.png $(iconpath)/bluefish-icon.png ;\
+		# $(INSTALL_DATA) inline_images/bluefish_icon1.png $(iconpath)/bluefish-icon.png ;\
 	fi
	@cd src/ && $(MAKE) install
 	@cd po/ && $(MAKE) install
diff -ruN bluefish-0.9.orig/data/Makefile.in bluefish-0.9/data/Makefile.in
--- bluefish-0.9.orig/data/Makefile.in	Wed Feb 19 23:39:25 2003
+++ bluefish-0.9/data/Makefile.in	Wed Feb 19 23:43:55 2003
@@ -12,7 +12,7 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
-pkgdatadir = @pkgdatadir@
+pkgdatadir = $(DESTDIR)/@pkgdatadir@
 datadir = @datadir@
 localedir = $(datadir)/locale
 
@@ -33,11 +33,11 @@
 		$(INSTALL_DATA) $$file $(pkgdatadir)/$$file ;\
 	done
 	if [ -d $(gnome2menupath) ] ; then \
-		$(INSTALL_DATA) bluefish.desktop $(gnome2menupath) ;\
+		$(INSTALL_DATA) bluefish.desktop $(DESTDIR)/$(gnome2menupath) ;\
 	fi
 	if [ -d $(gnome1menupath) ] ; then \
-		$(INSTALL_DIR) $(gnome1menupath)/Applications ;\
+		$(INSTALL_DIR) $(DESTDIR)/$(gnome1menupath)/Applications ;\
-		$(INSTALL_DATA) bluefish.desktop $(gnome1menupath)/Applications ;\
+		$(INSTALL_DATA) bluefish.desktop $(DESTDIR)/$(gnome1menupath)/Applications ;\
 	fi
 
 uninstall:
diff -ruN bluefish-0.9.orig/icons/Makefile.in bluefish-0.9/icons/Makefile.in
--- bluefish-0.9.orig/icons/Makefile.in	Wed Feb 19 23:39:25 2003
+++ bluefish-0.9/icons/Makefile.in	Wed Feb 19 23:42:52 2003
@@ -22,7 +22,7 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
-pkgdatadir = @pkgdatadir@
+pkgdatadir = $(DESTDIR)/@pkgdatadir@
 
 infodir = $(prefix)/info
 libdir = $(prefix)/lib/gnudl
diff -ruN bluefish-0.9.orig/po/Makefile.in bluefish-0.9/po/Makefile.in
--- bluefish-0.9.orig/po/Makefile.in	Wed Feb 19 23:39:24 2003
+++ bluefish-0.9/po/Makefile.in	Wed Feb 19 23:45:52 2003
@@ -14,7 +14,7 @@
 bindir = @bindir@
 pkgdatadir = @pkgdatadir@
 datadir = @datadir@
-localedir = $(datadir)/locale
+localedir = $(DESTDIR)/$(datadir)/locale
 
 INSTALL = @INSTALL@
 INSTALL_DIR = $(INSTALL) -d -m 755 
diff -ruN bluefish-0.9.orig/src/Makefile.in bluefish-0.9/src/Makefile.in
--- bluefish-0.9.orig/src/Makefile.in	Wed Feb 19 23:39:25 2003
+++ bluefish-0.9/src/Makefile.in	Wed Feb 19 23:44:37 2003
@@ -21,7 +21,7 @@
 srcdir = @srcdir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
-bindir = @bindir@
+bindir = $(DESTDIR)/@bindir@
 pkgdatadir = @pkgdatadir@
 
 infodir = $(prefix)/info
--- bluefish-0.9/Makefile.in~	Thu Feb 20 00:29:51 2003
+++ bluefish-0.9/Makefile.in	Thu Feb 20 00:32:12 2003
@@ -68,9 +68,9 @@
 	$(INSTALL_DIR) $(pkgdatadir)
 	$(INSTALL_DATA) images/bluefish_splash.png $(pkgdatadir)
 	@cd icons/ && $(MAKE) install
-	if [ -d $(iconpath) ]; then \
+#	if [ -d $(iconpath) ]; then \
 		# $(INSTALL_DATA) inline_images/bluefish_icon1.png $(iconpath)/bluefish-icon.png ;\
-	fi
+#	fi
 	@cd src/ && $(MAKE) install
 	@cd po/ && $(MAKE) install
 	@cd data/ && $(MAKE) install
Commit	Line	Data
3d1c5c7e	1	diff -ruN bluefish-0.9.orig/Makefile.in bluefish-0.9/Makefile.in
	2	--- bluefish-0.9.orig/Makefile.in Wed Feb 19 23:39:25 2003
	3	+++ bluefish-0.9/Makefile.in Wed Feb 19 23:45:25 2003
	4	@@ -29,7 +29,7 @@
	5	exec_prefix=@exec_prefix@
	6	bindir=@bindir@
	7	datadir=@datadir@
	8	-pkgdatadir=$(datadir)/$(PACKAGE)
	9	+pkgdatadir=$(DESTDIR)/$(datadir)/$(PACKAGE)
	10	pixmapsdir=@prefix@/share/pixmaps
8ecac827	11
3d1c5c7e	12	INSTALL = @INSTALL@
	13	@@ -64,12 +64,12 @@
	14	rm -f .orig .rej
8ecac827	15
3d1c5c7e	16	install: src/bluefish
	17	- pkgdatadir=@pkgdatadir@
	18	+ pkgdatadir=$(DESTDIR)/@pkgdatadir@
	19	$(INSTALL_DIR) $(pkgdatadir)
	20	$(INSTALL_DATA) images/bluefish_splash.png $(pkgdatadir)
	21	@cd icons/ && $(MAKE) install
4412b25e	22	if [ -d $(iconpath) ]; then \
	23	- $(INSTALL_DATA) inline_images/bluefish_icon1.png $(iconpath)/bluefish-icon.png ;\
	24	+ # $(INSTALL_DATA) inline_images/bluefish_icon1.png $(iconpath)/bluefish-icon.png ;\
3d1c5c7e	25	fi
	26	@cd src/ && $(MAKE) install
	27	@cd po/ && $(MAKE) install
	28	diff -ruN bluefish-0.9.orig/data/Makefile.in bluefish-0.9/data/Makefile.in
	29	--- bluefish-0.9.orig/data/Makefile.in Wed Feb 19 23:39:25 2003
	30	+++ bluefish-0.9/data/Makefile.in Wed Feb 19 23:43:55 2003
	31	@@ -12,7 +12,7 @@
	32	prefix = @prefix@
	33	exec_prefix = @exec_prefix@
	34	bindir = @bindir@
	35	-pkgdatadir = @pkgdatadir@
	36	+pkgdatadir = $(DESTDIR)/@pkgdatadir@
	37	datadir = @datadir@
	38	localedir = $(datadir)/locale
8ecac827	39
4412b25e	40	@@ -33,11 +33,11 @@
3d1c5c7e	41	$(INSTALL_DATA) $$file $(pkgdatadir)/$$file ;\
3d1c5c7e	42	done
4412b25e	43	if [ -d $(gnome2menupath) ] ; then \
	44	- $(INSTALL_DATA) bluefish.desktop $(gnome2menupath) ;\
	45	+ $(INSTALL_DATA) bluefish.desktop $(DESTDIR)/$(gnome2menupath) ;\
3d1c5c7e	46	fi
4412b25e	47	if [ -d $(gnome1menupath) ] ; then \
	48	- $(INSTALL_DIR) $(gnome1menupath)/Applications ;\
	49	+ $(INSTALL_DIR) $(DESTDIR)/$(gnome1menupath)/Applications ;\
	50	- $(INSTALL_DATA) bluefish.desktop $(gnome1menupath)/Applications ;\
	51	+ $(INSTALL_DATA) bluefish.desktop $(DESTDIR)/$(gnome1menupath)/Applications ;\
3d1c5c7e	52	fi
85bc3747	53
85bc3747	54	uninstall:
3d1c5c7e	55	diff -ruN bluefish-0.9.orig/icons/Makefile.in bluefish-0.9/icons/Makefile.in
	56	--- bluefish-0.9.orig/icons/Makefile.in Wed Feb 19 23:39:25 2003
	57	+++ bluefish-0.9/icons/Makefile.in Wed Feb 19 23:42:52 2003
	58	@@ -22,7 +22,7 @@
	59	prefix = @prefix@
	60	exec_prefix = @exec_prefix@
	61	bindir = @bindir@
	62	-pkgdatadir = @pkgdatadir@
	63	+pkgdatadir = $(DESTDIR)/@pkgdatadir@
85bc3747	64
3d1c5c7e	65	infodir = $(prefix)/info
	66	libdir = $(prefix)/lib/gnudl
	67	diff -ruN bluefish-0.9.orig/po/Makefile.in bluefish-0.9/po/Makefile.in
	68	--- bluefish-0.9.orig/po/Makefile.in Wed Feb 19 23:39:24 2003
	69	+++ bluefish-0.9/po/Makefile.in Wed Feb 19 23:45:52 2003
	70	@@ -14,7 +14,7 @@
	71	bindir = @bindir@
	72	pkgdatadir = @pkgdatadir@
	73	datadir = @datadir@
	74	-localedir = $(datadir)/locale
	75	+localedir = $(DESTDIR)/$(datadir)/locale
85bc3747	76
3d1c5c7e	77	INSTALL = @INSTALL@
	78	INSTALL_DIR = $(INSTALL) -d -m 755
	79	diff -ruN bluefish-0.9.orig/src/Makefile.in bluefish-0.9/src/Makefile.in
	80	--- bluefish-0.9.orig/src/Makefile.in Wed Feb 19 23:39:25 2003
	81	+++ bluefish-0.9/src/Makefile.in Wed Feb 19 23:44:37 2003
	82	@@ -21,7 +21,7 @@
	83	srcdir = @srcdir@
	84	prefix = @prefix@
	85	exec_prefix = @exec_prefix@
	86	-bindir = @bindir@
	87	+bindir = $(DESTDIR)/@bindir@
	88	pkgdatadir = @pkgdatadir@
8ecac827	89
3d1c5c7e	90	infodir = $(prefix)/info
	91	--- bluefish-0.9/Makefile.in~ Thu Feb 20 00:29:51 2003
	92	+++ bluefish-0.9/Makefile.in Thu Feb 20 00:32:12 2003
	93	@@ -68,9 +68,9 @@
	94	$(INSTALL_DIR) $(pkgdatadir)
	95	$(INSTALL_DATA) images/bluefish_splash.png $(pkgdatadir)
	96	@cd icons/ && $(MAKE) install
4412b25e	97	- if [ -d $(iconpath) ]; then \
	98	+# if [ -d $(iconpath) ]; then \
	99	# $(INSTALL_DATA) inline_images/bluefish_icon1.png $(iconpath)/bluefish-icon.png ;\
3d1c5c7e	100	- fi
	101	+# fi
	102	@cd src/ && $(MAKE) install
	103	@cd po/ && $(MAKE) install
	104	@cd data/ && $(MAKE) install