[Monodevelop-patches-list] r964 - in trunk/MonoDevelop: . gdldock/gdl gtkmozembed-sharp libmonodevelop

[commit-watcher at mono-cvs.ximian.com]

Author: jluke
Date: 2004-02-20 02:42:21 -0500 (Fri, 20 Feb 2004)
New Revision: 964

Modified:
   trunk/MonoDevelop/Makefile.am
   trunk/MonoDevelop/configure.in
   trunk/MonoDevelop/gdldock/gdl/Makefile.am
   trunk/MonoDevelop/gtkmozembed-sharp/Makefile.am
   trunk/MonoDevelop/libmonodevelop/Makefile.am
Log:
build fixes, especially when md_prefix != gtksharp_prefix


Modified: trunk/MonoDevelop/Makefile.am
===================================================================
--- trunk/MonoDevelop/Makefile.am	2004-02-20 07:35:08 UTC (rev 963)
+++ trunk/MonoDevelop/Makefile.am	2004-02-20 07:42:21 UTC (rev 964)
@@ -1,4 +1,6 @@
-SUBDIRS=libmonodevelop gdldock gtkmozembed-sharp src build data
+# leave gdldock first
+# (mkdir ../../build/bin/ hack)
+SUBDIRS=gdldock libmonodevelop gtkmozembed-sharp src build data
 
 bin_SCRIPTS=monodevelop
 

Modified: trunk/MonoDevelop/configure.in
===================================================================
--- trunk/MonoDevelop/configure.in	2004-02-20 07:35:08 UTC (rev 963)
+++ trunk/MonoDevelop/configure.in	2004-02-20 07:42:21 UTC (rev 964)
@@ -30,6 +30,8 @@
 GTKSHARP_REQUIRED_VERSION=0.17
 
 PKG_CHECK_MODULES(BASE_DEPENDENCIES, gtk-sharp >= $GTKSHARP_REQUIRED_VERSION, enable_gtksharp=yes, enable_gtksharp=no) 
+gtksharp_prefix=`pkg-config --variable=prefix gtk-sharp`
+AC_SUBST(gtksharp_prefix)
 
 GTKSOURCEVIEW_REQUIRED_VERSION=0.7
 

Modified: trunk/MonoDevelop/gdldock/gdl/Makefile.am
===================================================================
--- trunk/MonoDevelop/gdldock/gdl/Makefile.am	2004-02-20 07:35:08 UTC (rev 963)
+++ trunk/MonoDevelop/gdldock/gdl/Makefile.am	2004-02-20 07:42:21 UTC (rev 964)
@@ -3,9 +3,9 @@
 ASSEMBLY = ../../build/bin/gdl-sharp.dll
 
 INCLUDE_APIS = \
-	@prefix@/share/gapi/gdk-api.xml \
-	@prefix@/share/gapi/gtk-api.xml \
-	@prefix@/share/gapi/atk-api.xml
+	@gtksharp_prefix@/share/gapi/gdk-api.xml \
+	@gtksharp_prefix@/share/gapi/gtk-api.xml \
+	@gtksharp_prefix@/share/gapi/atk-api.xml
 			
 all: generated-stamp $(ASSEMBLY)
 
@@ -19,7 +19,7 @@
 	--recurse '*.cs' -o $(ASSEMBLY)
 
 ../../build/bin:
-	../..//mkinstalldirs ../../build/bin
+	mkdir ../../build/bin
 
 gdldocklibdir = $(prefix)/lib/monodevelop
 

Modified: trunk/MonoDevelop/gtkmozembed-sharp/Makefile.am
===================================================================
--- trunk/MonoDevelop/gtkmozembed-sharp/Makefile.am	2004-02-20 07:35:08 UTC (rev 963)
+++ trunk/MonoDevelop/gtkmozembed-sharp/Makefile.am	2004-02-20 07:42:21 UTC (rev 964)
@@ -2,9 +2,9 @@
 ASSEMBLY = ../build/bin/gtkmozembed-sharp.dll
 
 INCLUDE_APIS = \
-	@prefix@/share/gapi/gdk-api.xml \
-	@prefix@/share/gapi/gtk-api.xml \
-	@prefix@/share/gapi/atk-api.xml
+	@gtksharp_prefix@/share/gapi/gdk-api.xml \
+	@gtksharp_prefix@/share/gapi/gtk-api.xml \
+	@gtksharp_prefix@/share/gapi/atk-api.xml
 			
 all: generated-stamp $(ASSEMBLY)
 

Modified: trunk/MonoDevelop/libmonodevelop/Makefile.am
===================================================================
--- trunk/MonoDevelop/libmonodevelop/Makefile.am	2004-02-20 07:35:08 UTC (rev 963)
+++ trunk/MonoDevelop/libmonodevelop/Makefile.am	2004-02-20 07:42:21 UTC (rev 964)
@@ -25,7 +25,7 @@
 
 libmonodevelop.so: $(libmonodevelop_OBJECTS)
 	$(CC) $(LDFLAGS) -shared -fPIC -o libmonodevelop.so $+ && \
-	cp libmonodevelop.so ../build/bin 
+	cp libmonodevelop.so ../build/bin/.
 
 %.o: %.c
 	$(CC) $(CFLAGS) $(INCLUDES) -c $<