[Gtk-sharp-list] Makefile.in patch

Duncan Mak duncan@ximian.com
17 Jun 2003 01:58:17 -0400
Previous message: [Gtk-sharp-list] kernel support.
Next message: [Gtk-sharp-list] Makefile.in patch
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
--=-OGN0v//MrfFTj0ktxCi9
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

Hey Mike,

I know we just realized Gtk-sharp 0.10, but as I was trying to build
packages here, I ran into the problem where every instead of
$(DESTDIR)@prefix@ in the Makefile.in will warp into '/usr/lib' instead
of $(DESTDIR)/usr/lib. I was having trouble in the install step because
of this.

This patch replaces all instance of $(DESTDIR)@prefix@ with
$(DESTDIR)$(prefix) and it fixes my problem. I tested it in my normal,
non-packaging gtk-sharp directory, and it seems to be fine.

Is this patch ridiculously wrong? I know very little about how these
things work... should I commit it?

thanks,

Duncan.

--=-OGN0v//MrfFTj0ktxCi9
Content-Disposition: attachment; filename=makefile.patch
Content-Transfer-Encoding: quoted-printable
Content-Type: text/x-patch; name=makefile.patch; charset=ISO-8859-15

diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk-sharp-0.10.orig/art/M=
akefile.in gtk-sharp-0.10/art/Makefile.in
--- gtk-sharp-0.10.orig/art/Makefile.in	2002-12-22 00:08:50.000000000 -0500
+++ gtk-sharp-0.10/art/Makefile.in	2003-06-17 01:10:00.000000000 -0400
@@ -16,6 +16,6 @@
 	rm -rf generated
=20
 install: all
-	../mkinstalldirs $(DESTDIR)@prefix@/lib && \
-	cp art-sharp.dll $(DESTDIR)@prefix@/lib
+	../mkinstalldirs $(DESTDIR)$(prefix)/lib && \
+	cp art-sharp.dll $(DESTDIR)$(prefix)/lib
=20
diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk-sharp-0.10.orig/atk/M=
akefile.in gtk-sharp-0.10/atk/Makefile.in
--- gtk-sharp-0.10.orig/atk/Makefile.in	2002-12-22 00:08:50.000000000 -0500
+++ gtk-sharp-0.10/atk/Makefile.in	2003-06-17 01:10:00.000000000 -0400
@@ -16,6 +16,6 @@
 	rm -rf generated
=20
 install: all
-	../mkinstalldirs $(DESTDIR)@prefix@/lib && \
-	cp atk-sharp.dll $(DESTDIR)@prefix@/lib
+	../mkinstalldirs $(DESTDIR)$(prefix)/lib && \
+	cp atk-sharp.dll $(DESTDIR)$(prefix)/lib
=20
diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk-sharp-0.10.orig/gconf=
/GConf/Makefile.in gtk-sharp-0.10/gconf/GConf/Makefile.in
--- gtk-sharp-0.10.orig/gconf/GConf/Makefile.in	2002-12-22 00:08:50.0000000=
00 -0500
+++ gtk-sharp-0.10/gconf/GConf/Makefile.in	2003-06-17 01:10:00.000000000 -0=
400
@@ -19,8 +19,8 @@
 	$(MCS) $(SOURCES) -L ../../glib /r:glib-sharp.dll /target:library /out:gc=
onf-sharp.dll
=20
 install: all
-	../../mkinstalldirs $(DESTDIR)@prefix@/lib && \
-	cp gconf-sharp.dll $(DESTDIR)@prefix@/lib
+	../../mkinstalldirs $(DESTDIR)$(prefix)/lib && \
+	cp gconf-sharp.dll $(DESTDIR)$(prefix)/lib
=20
 clean:
 	rm -f gconf-sharp.dll
diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk-sharp-0.10.orig/gconf=
/GConf.PropertyEditors/Makefile.in gtk-sharp-0.10/gconf/GConf.PropertyEdito=
rs/Makefile.in
--- gtk-sharp-0.10.orig/gconf/GConf.PropertyEditors/Makefile.in	2002-12-22 =
00:08:50.000000000 -0500
+++ gtk-sharp-0.10/gconf/GConf.PropertyEditors/Makefile.in	2003-06-17 01:10=
:00.000000000 -0400
@@ -21,8 +21,8 @@
 	$(MCS) $(SOURCES) -L ../../glib -L ../../pango -L ../../atk -L ../../gdk =
-L ../../gtk -L ../../art -L ../../gnome -L ../GConf -L ../../glade /r:glib=
-sharp.dll /r:pango-sharp.dll /r:atk-sharp.dll /r:gdk-sharp.dll /r:gtk-shar=
p.dll /r:art-sharp.dll /r:gnome-sharp.dll /r:glade-sharp.dll /r:gconf-sharp=
.dll /r:System.Drawing /target:library /out:gconf-sharp-peditors.dll
=20
 install: all
-	../../mkinstalldirs $(DESTDIR)@prefix@/lib && \
-	cp gconf-sharp-peditors.dll $(DESTDIR)@prefix@/lib
+	../../mkinstalldirs $(DESTDIR)$(prefix)/lib && \
+	cp gconf-sharp-peditors.dll $(DESTDIR)$(prefix)/lib
=20
 clean:
 	rm -f gconf-sharp-peditors.dll
diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk-sharp-0.10.orig/gconf=
/tools/Makefile.in gtk-sharp-0.10/gconf/tools/Makefile.in
--- gtk-sharp-0.10.orig/gconf/tools/Makefile.in	2002-12-22 00:08:51.0000000=
00 -0500
+++ gtk-sharp-0.10/gconf/tools/Makefile.in	2003-06-17 01:10:00.000000000 -0=
400
@@ -17,8 +17,8 @@
 	&& chmod +x gconfsharp-schemagen =20
=20
 install: all
-	../../mkinstalldirs $(DESTDIR)@prefix@/bin && \
-	chmod +x gconfsharp-schemagen && cp gconfsharp-schemagen.exe gconfsharp-s=
chemagen $(DESTDIR)@prefix@/bin
+	../../mkinstalldirs $(DESTDIR)$(prefix)/bin && \
+	chmod +x gconfsharp-schemagen && cp gconfsharp-schemagen.exe gconfsharp-s=
chemagen $(DESTDIR)$(prefix)/bin
=20
 clean:
 	rm -f gconfsharp-schemagen.exe
diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk-sharp-0.10.orig/gda/M=
akefile.in gtk-sharp-0.10/gda/Makefile.in
--- gtk-sharp-0.10.orig/gda/Makefile.in	2002-12-22 00:08:51.000000000 -0500
+++ gtk-sharp-0.10/gda/Makefile.in	2003-06-17 01:10:00.000000000 -0400
@@ -17,5 +17,5 @@
 	rm -rf generated
=20
 install: all
-@ENABLE_GDA_TRUE@	../mkinstalldirs $(DESTDIR)@prefix@/lib && \
-@ENABLE_GDA_TRUE@	cp gda-sharp.dll $(DESTDIR)@prefix@/lib
+@ENABLE_GDA_TRUE@	../mkinstalldirs $(DESTDIR)$(prefix)/lib && \
+@ENABLE_GDA_TRUE@	cp gda-sharp.dll $(DESTDIR)$(prefix)/lib
diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk-sharp-0.10.orig/gdk/M=
akefile.in gtk-sharp-0.10/gdk/Makefile.in
--- gtk-sharp-0.10.orig/gdk/Makefile.in	2003-01-05 20:44:49.000000000 -0500
+++ gtk-sharp-0.10/gdk/Makefile.in	2003-06-17 01:10:00.000000000 -0400
@@ -16,6 +16,6 @@
 	rm -rf generated
=20
 install: all
-	../mkinstalldirs $(DESTDIR)@prefix@/lib && \
-	cp gdk-sharp.dll $(DESTDIR)@prefix@/lib
+	../mkinstalldirs $(DESTDIR)$(prefix)/lib && \
+	cp gdk-sharp.dll $(DESTDIR)$(prefix)/lib
=20
diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk-sharp-0.10.orig/glade=
/Makefile.in gtk-sharp-0.10/glade/Makefile.in
--- gtk-sharp-0.10.orig/glade/Makefile.in	2002-12-22 00:08:51.000000000 -05=
00
+++ gtk-sharp-0.10/glade/Makefile.in	2003-06-17 01:10:00.000000000 -0400
@@ -17,5 +17,5 @@
 	rm -rf generated
=20
 install: all
-@ENABLE_GLADE_TRUE@	../mkinstalldirs $(DESTDIR)@prefix@/lib && \
-@ENABLE_GLADE_TRUE@	cp glade-sharp.dll $(DESTDIR)@prefix@/lib
+@ENABLE_GLADE_TRUE@	../mkinstalldirs $(DESTDIR)$(prefix)/lib && \
+@ENABLE_GLADE_TRUE@	cp glade-sharp.dll $(DESTDIR)$(prefix)/lib
diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk-sharp-0.10.orig/glib/=
Makefile.in gtk-sharp-0.10/glib/Makefile.in
--- gtk-sharp-0.10.orig/glib/Makefile.in	2002-12-22 00:08:51.000000000 -050=
0
+++ gtk-sharp-0.10/glib/Makefile.in	2003-06-17 01:10:00.000000000 -0400
@@ -16,6 +16,6 @@
 	rm -rf generated
=20
 install: all
-	../mkinstalldirs $(DESTDIR)@prefix@/lib && \
-	cp glib-sharp.dll $(DESTDIR)@prefix@/lib || exit 1
+	../mkinstalldirs $(DESTDIR)$(prefix)/lib && \
+	cp glib-sharp.dll $(DESTDIR)$(prefix)/lib || exit 1
=20
diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk-sharp-0.10.orig/gnome=
/Makefile.in gtk-sharp-0.10/gnome/Makefile.in
--- gtk-sharp-0.10.orig/gnome/Makefile.in	2002-12-22 00:08:51.000000000 -05=
00
+++ gtk-sharp-0.10/gnome/Makefile.in	2003-06-17 01:10:00.000000000 -0400
@@ -17,6 +17,6 @@
 	rm -rf generated
=20
 install: all
-@ENABLE_GNOME_TRUE@	../mkinstalldirs $(DESTDIR)@prefix@/lib && \
-@ENABLE_GNOME_TRUE@	cp gnome-sharp.dll $(DESTDIR)@prefix@/lib
+@ENABLE_GNOME_TRUE@	../mkinstalldirs $(DESTDIR)$(prefix)/lib && \
+@ENABLE_GNOME_TRUE@	cp gnome-sharp.dll $(DESTDIR)$(prefix)/lib
=20
diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk-sharp-0.10.orig/gnome=
db/Makefile.in gtk-sharp-0.10/gnomedb/Makefile.in
--- gtk-sharp-0.10.orig/gnomedb/Makefile.in	2002-12-22 00:08:52.000000000 -=
0500
+++ gtk-sharp-0.10/gnomedb/Makefile.in	2003-06-17 01:10:00.000000000 -0400
@@ -17,5 +17,5 @@
 	rm -rf generated
=20
 install: all
-@ENABLE_GNOMEDB_TRUE@	../mkinstalldirs $(DESTDIR)@prefix@/lib && \
-@ENABLE_GNOMEDB_TRUE@	cp gnomedb-sharp.dll $(DESTDIR)@prefix@/lib
+@ENABLE_GNOMEDB_TRUE@	../mkinstalldirs $(DESTDIR)$(prefix)/lib && \
+@ENABLE_GNOMEDB_TRUE@	cp gnomedb-sharp.dll $(DESTDIR)$(prefix)/lib
diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk-sharp-0.10.orig/gnome=
print/Makefile.in gtk-sharp-0.10/gnomeprint/Makefile.in
--- gtk-sharp-0.10.orig/gnomeprint/Makefile.in	2003-02-02 12:49:37.00000000=
0 -0500
+++ gtk-sharp-0.10/gnomeprint/Makefile.in	2003-06-17 01:10:00.000000000 -04=
00
@@ -16,6 +16,6 @@
 	rm -rf generated
=20
 install: all
-	../mkinstalldirs $(DESTDIR)@prefix@/lib && \
-	cp gnomeprint-sharp.dll $(DESTDIR)@prefix@/lib || exit 1
+	../mkinstalldirs $(DESTDIR)$(prefix)/lib && \
+	cp gnomeprint-sharp.dll $(DESTDIR)$(prefix)/lib || exit 1
=20
diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk-sharp-0.10.orig/gst/M=
akefile.in gtk-sharp-0.10/gst/Makefile.in
--- gtk-sharp-0.10.orig/gst/Makefile.in	2002-12-22 00:08:52.000000000 -0500
+++ gtk-sharp-0.10/gst/Makefile.in	2003-06-17 01:10:00.000000000 -0400
@@ -16,6 +16,6 @@
 	rm -rf generated
=20
 install: all
-	../mkinstalldirs $(DESTDIR)@prefix@/lib && \
-	cp gst-sharp.dll $(DESTDIR)@prefix@/lib || exit 1
+	../mkinstalldirs $(DESTDIR)$(prefix)/lib && \
+	cp gst-sharp.dll $(DESTDIR)$(prefix)/lib || exit 1
=20
diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk-sharp-0.10.orig/gtk/M=
akefile.in gtk-sharp-0.10/gtk/Makefile.in
--- gtk-sharp-0.10.orig/gtk/Makefile.in	2002-12-22 00:08:52.000000000 -0500
+++ gtk-sharp-0.10/gtk/Makefile.in	2003-06-17 01:10:00.000000000 -0400
@@ -16,6 +16,6 @@
 	rm -rf generated
=20
 install: all
-	../mkinstalldirs $(DESTDIR)@prefix@/lib && \
-	cp gtk-sharp.dll $(DESTDIR)@prefix@/lib
+	../mkinstalldirs $(DESTDIR)$(prefix)/lib && \
+	cp gtk-sharp.dll $(DESTDIR)$(prefix)/lib
=20
diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk-sharp-0.10.orig/Makef=
ile.in gtk-sharp-0.10/Makefile.in
--- gtk-sharp-0.10.orig/Makefile.in	2003-04-21 11:25:26.000000000 -0400
+++ gtk-sharp-0.10/Makefile.in	2003-06-17 01:16:10.000000000 -0400
@@ -62,5 +62,5 @@
 	done
=20
 install-pkgconfig:
-	./mkinstalldirs   $(DESTDIR)@prefix@/lib/pkgconfig
-	cp gtk-sharp.pc $(DESTDIR)@prefix@/lib/pkgconfig
+	./mkinstalldirs   $(DESTDIR)$(prefix)/lib/pkgconfig
+	cp gtk-sharp.pc $(DESTDIR)$(prefix)/lib/pkgconfig
diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk-sharp-0.10.orig/pango=
/Makefile.in gtk-sharp-0.10/pango/Makefile.in
--- gtk-sharp-0.10.orig/pango/Makefile.in	2003-01-06 23:03:48.000000000 -05=
00
+++ gtk-sharp-0.10/pango/Makefile.in	2003-06-17 01:10:00.000000000 -0400
@@ -16,6 +16,6 @@
 	rm -rf generated
=20
 install: all
-	../mkinstalldirs $(DESTDIR)@prefix@/lib && \
-	cp pango-sharp.dll $(DESTDIR)@prefix@/lib
+	../mkinstalldirs $(DESTDIR)$(prefix)/lib && \
+	cp pango-sharp.dll $(DESTDIR)$(prefix)/lib
=20
diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk-sharp-0.10.orig/rsvg/=
Makefile.in gtk-sharp-0.10/rsvg/Makefile.in
--- gtk-sharp-0.10.orig/rsvg/Makefile.in	2003-05-05 11:41:41.000000000 -040=
0
+++ gtk-sharp-0.10/rsvg/Makefile.in	2003-06-17 01:10:00.000000000 -0400
@@ -32,6 +32,6 @@
=20
=20
 install: all
-@ENABLE_RSVG_TRUE@	../mkinstalldirs $(DESTDIR)@prefix@/lib && \
-@ENABLE_RSVG_TRUE@	cp $(OUTPUT) $(DESTDIR)@prefix@/lib
+@ENABLE_RSVG_TRUE@	../mkinstalldirs $(DESTDIR)$(prefix)/lib && \
+@ENABLE_RSVG_TRUE@	cp $(OUTPUT) $(DESTDIR)$(prefix)/lib
=20

--=-OGN0v//MrfFTj0ktxCi9--
Previous message: [Gtk-sharp-list] kernel support.
Next message: [Gtk-sharp-list] Makefile.in patch
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]