diff --git a/ChangeLog b/ChangeLog index b035ab2d6..6985a8b78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-10-08 Mike Kestner + + * */Makefile.in : rework the prefix handling for duncan's packaging. + 2003-10-08 Martin Willemoes Hansen * gnome/PrintJob.custom: Added default ctor. diff --git a/art/Makefile.in b/art/Makefile.in index f551cf458..c5b37c52c 100755 --- a/art/Makefile.in +++ b/art/Makefile.in @@ -1,5 +1,6 @@ MCS=mcs DESTDIR= +prefix=@prefix@ all: linux @@ -16,6 +17,6 @@ clean: rm -rf generated install: all - ../mkinstalldirs $(DESTDIR)@prefix@/lib && \ - cp art-sharp.dll $(DESTDIR)@prefix@/lib + ../mkinstalldirs $(DESTDIR)$(prefix)/lib && \ + cp art-sharp.dll $(DESTDIR)$(prefix)/lib diff --git a/atk/Makefile.in b/atk/Makefile.in index f0990b4e4..8e5581411 100644 --- a/atk/Makefile.in +++ b/atk/Makefile.in @@ -1,5 +1,6 @@ MCS=mcs DESTDIR= +prefix=@prefix@ all: linux @@ -16,6 +17,6 @@ clean: rm -rf generated install: all - ../mkinstalldirs $(DESTDIR)@prefix@/lib && \ - cp atk-sharp.dll $(DESTDIR)@prefix@/lib + ../mkinstalldirs $(DESTDIR)$(prefix)/lib && \ + cp atk-sharp.dll $(DESTDIR)$(prefix)/lib diff --git a/gconf/GConf.PropertyEditors/Makefile.in b/gconf/GConf.PropertyEditors/Makefile.in index 5df78083a..c99bfec54 100644 --- a/gconf/GConf.PropertyEditors/Makefile.in +++ b/gconf/GConf.PropertyEditors/Makefile.in @@ -1,5 +1,6 @@ MCS = mcs DESTDIR = +prefix=@prefix@ SOURCES = \ PropertyEditor.cs \ @@ -21,8 +22,8 @@ gconf-sharp-peditors.dll: $(SOURCES) $(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-sharp.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 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 clean: rm -f gconf-sharp-peditors.dll diff --git a/gconf/GConf/Makefile.in b/gconf/GConf/Makefile.in index ed40dafa0..19d6b1d64 100644 --- a/gconf/GConf/Makefile.in +++ b/gconf/GConf/Makefile.in @@ -1,5 +1,6 @@ MCS = mcs DESTDIR = +prefix=@prefix@ SOURCES = \ ClientBase.cs \ @@ -19,8 +20,8 @@ gconf-sharp.dll: $(SOURCES) $(MCS) $(SOURCES) -L ../../glib /r:glib-sharp.dll /target:library /out:gconf-sharp.dll install: all - ../../mkinstalldirs $(DESTDIR)@prefix@/lib && \ - cp gconf-sharp.dll $(DESTDIR)@prefix@/lib + ../../mkinstalldirs $(DESTDIR)$(prefix)/lib && \ + cp gconf-sharp.dll $(DESTDIR)$(prefix)/lib clean: rm -f gconf-sharp.dll diff --git a/gconf/tools/Makefile.in b/gconf/tools/Makefile.in index 7fbfd2ae3..eb83276f0 100644 --- a/gconf/tools/Makefile.in +++ b/gconf/tools/Makefile.in @@ -1,6 +1,7 @@ MCS = mcs DESTDIR = -bindir = @prefix@/bin +prefix=@prefix@ +bindir = $(prefix)/bin SOURCES = \ schemagen.cs \ @@ -17,8 +18,8 @@ gconfsharp-schemagen: gconfsharp-schemagen.in && chmod +x gconfsharp-schemagen install: all - ../../mkinstalldirs $(DESTDIR)@prefix@/bin && \ - chmod +x gconfsharp-schemagen && cp gconfsharp-schemagen.exe gconfsharp-schemagen $(DESTDIR)@prefix@/bin + ../../mkinstalldirs $(DESTDIR)$(prefix)/bin && \ + chmod +x gconfsharp-schemagen && cp gconfsharp-schemagen.exe gconfsharp-schemagen $(DESTDIR)$(bindir) clean: rm -f gconfsharp-schemagen.exe diff --git a/gda/Makefile.in b/gda/Makefile.in index 9fd6bafed..b00662db1 100755 --- a/gda/Makefile.in +++ b/gda/Makefile.in @@ -1,5 +1,6 @@ MCS=mcs DESTDIR= +prefix=@prefix@ @ENABLE_GDA_TRUE@ all: linux @ENABLE_GDA_FALSE@ all: @@ -17,5 +18,5 @@ clean: rm -rf generated 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 --git a/gdk/Makefile.in b/gdk/Makefile.in index a49a0ba0b..5765e1fca 100755 --- a/gdk/Makefile.in +++ b/gdk/Makefile.in @@ -1,5 +1,6 @@ MCS=mcs DESTDIR= +prefix=@prefix@ all: linux @@ -16,6 +17,6 @@ clean: rm -rf generated install: all - ../mkinstalldirs $(DESTDIR)@prefix@/lib && \ - cp gdk-sharp.dll $(DESTDIR)@prefix@/lib + ../mkinstalldirs $(DESTDIR)$(prefix)/lib && \ + cp gdk-sharp.dll $(DESTDIR)$(prefix)/lib diff --git a/glade/Makefile.in b/glade/Makefile.in index bf228ea52..50fa4b551 100755 --- a/glade/Makefile.in +++ b/glade/Makefile.in @@ -1,5 +1,6 @@ MCS=mcs DESTDIR= +prefix=@prefix@ @ENABLE_GLADE_TRUE@ all: linux @ENABLE_GLADE_FALSE@ all: @@ -17,5 +18,5 @@ clean: rm -rf generated 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 --git a/glib/Makefile.in b/glib/Makefile.in index b14d9829f..d9096505d 100755 --- a/glib/Makefile.in +++ b/glib/Makefile.in @@ -1,5 +1,6 @@ MCS=mcs DESTDIR= +prefix=@prefix@ all: linux @@ -16,6 +17,6 @@ clean: rm -rf generated 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 diff --git a/gnome/Makefile.in b/gnome/Makefile.in index e539feb39..df9cf31b0 100755 --- a/gnome/Makefile.in +++ b/gnome/Makefile.in @@ -1,5 +1,6 @@ MCS=mcs DESTDIR= +prefix=@prefix@ @ENABLE_GNOME_TRUE@ all: linux @ENABLE_GNOME_FALSE@ all: @@ -17,6 +18,6 @@ clean: rm -rf generated 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 diff --git a/gnomedb/Makefile.in b/gnomedb/Makefile.in index 31113ac2e..dbf83880b 100755 --- a/gnomedb/Makefile.in +++ b/gnomedb/Makefile.in @@ -1,5 +1,6 @@ MCS=mcs DESTDIR= +prefix=@prefix@ @ENABLE_GNOMEDB_TRUE@ all: linux @ENABLE_GNOMEDB_FALSE@ all: @@ -17,5 +18,5 @@ clean: rm -rf generated 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 --git a/gst/Makefile.in b/gst/Makefile.in index 58879f264..08913b638 100755 --- a/gst/Makefile.in +++ b/gst/Makefile.in @@ -1,5 +1,6 @@ MCS=mcs DESTDIR= +prefix=@prefix@ all: linux @@ -16,6 +17,6 @@ clean: rm -rf generated 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 diff --git a/gtk/Makefile.in b/gtk/Makefile.in index 3a8f07c6b..745bc5a24 100755 --- a/gtk/Makefile.in +++ b/gtk/Makefile.in @@ -1,5 +1,6 @@ MCS=mcs DESTDIR= +prefix=@prefix@ all: linux @@ -16,6 +17,6 @@ clean: rm -rf generated install: all - ../mkinstalldirs $(DESTDIR)@prefix@/lib && \ - cp gtk-sharp.dll $(DESTDIR)@prefix@/lib + ../mkinstalldirs $(DESTDIR)$(prefix)/lib && \ + cp gtk-sharp.dll $(DESTDIR)$(prefix)/lib diff --git a/pango/Makefile.in b/pango/Makefile.in index 9a67bfddb..a6d6fe108 100644 --- a/pango/Makefile.in +++ b/pango/Makefile.in @@ -1,5 +1,6 @@ MCS=mcs DESTDIR= +prefix=@prefix@ all: linux @@ -16,6 +17,6 @@ clean: rm -rf generated install: all - ../mkinstalldirs $(DESTDIR)@prefix@/lib && \ - cp pango-sharp.dll $(DESTDIR)@prefix@/lib + ../mkinstalldirs $(DESTDIR)$(prefix)/lib && \ + cp pango-sharp.dll $(DESTDIR)$(prefix)/lib diff --git a/rsvg/Makefile.in b/rsvg/Makefile.in index 3c248c258..5ad200008 100644 --- a/rsvg/Makefile.in +++ b/rsvg/Makefile.in @@ -1,5 +1,6 @@ COMPILER=mcs OUTPUT=rsvg-sharp.dll +prefix=@prefix@ @ENABLE_RSVG_TRUE@ all: linux @ENABLE_RSVG_FALSE@ all: @@ -33,6 +34,6 @@ clean-generated: 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