[Monodevelop-patches-list] r1896 - in trunk/MonoDevelop/Core: . build/AddIns build/AddIns/AddIns/BackendBindings build/AddIns/AddIns/BackendBindings/templates build/AddIns/AddIns/Misc/StartPage build/data/options build/data/resources/css build/data/resources/icons gdldock/gdl gdldock/sources/gdl

commit-watcher at mono-cvs.ximian.com commit-watcher at mono-cvs.ximian.com
Mon Jul 5 14:40:45 EDT 2004 

Author: tberman
Date: 2004-07-05 14:40:45 -0400 (Mon, 05 Jul 2004)
New Revision: 1896

Modified:
   trunk/MonoDevelop/Core/ChangeLog
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/Makefile.am
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/Makefile.am
   trunk/MonoDevelop/Core/build/AddIns/AddIns/Misc/StartPage/Makefile.am
   trunk/MonoDevelop/Core/build/AddIns/Makefile.am
   trunk/MonoDevelop/Core/build/data/options/Makefile.am
   trunk/MonoDevelop/Core/build/data/resources/css/Makefile.am
   trunk/MonoDevelop/Core/build/data/resources/icons/Makefile.am
   trunk/MonoDevelop/Core/gdldock/gdl/Makefile.am
   trunk/MonoDevelop/Core/gdldock/sources/gdl/Makefile.am
   trunk/MonoDevelop/Core/monodevelop.in
Log:
fix libdir == $(prefix)/lib assumption.


Modified: trunk/MonoDevelop/Core/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/ChangeLog	2004-07-05 06:23:15 UTC (rev 1895)
+++ trunk/MonoDevelop/Core/ChangeLog	2004-07-05 18:40:45 UTC (rev 1896)
@@ -1,5 +1,10 @@
 2004-07-05  Todd Berman  <tberman at off.net>
 
+	* Makefile.ams: remove libdir == $(prefix)/lib assumption. Patch from
+	Marcin Krzyzanowski <krzak at pld-linux.org>
+
+2004-07-05  Todd Berman  <tberman at off.net>
+
 	* configure.in:
 	* Makefile.am:
 	* libmonodevelop: Removed libmonodevelop.

Modified: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/Makefile.am	2004-07-05 06:23:15 UTC (rev 1895)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/Makefile.am	2004-07-05 18:40:45 UTC (rev 1896)
@@ -1,7 +1,7 @@
 
 SUBDIRS = templates
 
-monodevelopdir = $(prefix)/lib/monodevelop
+monodevelopdir = $(libdir)/monodevelop
 backendbindingsdir = $(monodevelopdir)/AddIns/AddIns/BackendBindings
 
 backendbindings_DATA = BackendBindings.addin.xml ILAsmBinding.addin.xml JavaBinding.addin.xml NemerleBinding.addin.xml

Modified: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/Makefile.am	2004-07-05 06:23:15 UTC (rev 1895)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/Makefile.am	2004-07-05 18:40:45 UTC (rev 1896)
@@ -1,4 +1,4 @@
-monodevelopdir = $(prefix)/lib/monodevelop
+monodevelopdir = $(libdir)/monodevelop
 templatedir = $(monodevelopdir)/AddIns/AddIns/BackendBindings/templates
 
 template_DATA = CSharpSessionStateWebService.xft.xml \

Modified: trunk/MonoDevelop/Core/build/AddIns/AddIns/Misc/StartPage/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/Misc/StartPage/Makefile.am	2004-07-05 06:23:15 UTC (rev 1895)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/Misc/StartPage/Makefile.am	2004-07-05 18:40:45 UTC (rev 1896)
@@ -1,5 +1,5 @@
 
-monodevelopdir = $(prefix)/lib/monodevelop
+monodevelopdir = $(libdir)/monodevelop
 startpagedir = $(monodevelopdir)/AddIns/AddIns/Misc/StartPage
 
 startpage_DATA = StartPage.addin.xml

Modified: trunk/MonoDevelop/Core/build/AddIns/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/Makefile.am	2004-07-05 06:23:15 UTC (rev 1895)
+++ trunk/MonoDevelop/Core/build/AddIns/Makefile.am	2004-07-05 18:40:45 UTC (rev 1896)
@@ -1,6 +1,6 @@
 SUBDIRS = AddIns
 
-monodevelopdir = $(prefix)/lib/monodevelop
+monodevelopdir = $(libdir)/monodevelop
 addindir = $(monodevelopdir)/AddIns
 
 addin_DATA = MonoDevelopNewEditor.addin.xml SharpDevelopCore.addin.xml

Modified: trunk/MonoDevelop/Core/build/data/options/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/build/data/options/Makefile.am	2004-07-05 06:23:15 UTC (rev 1895)
+++ trunk/MonoDevelop/Core/build/data/options/Makefile.am	2004-07-05 18:40:45 UTC (rev 1896)
@@ -1,5 +1,5 @@
 
-monodevelopdir = $(prefix)/lib/monodevelop
+monodevelopdir = $(libdir)/monodevelop
 mdoptionsdir = $(monodevelopdir)/data/options
 mdoptions_DATA = DefaultEditingLayout.xml \
 	MonoDevelopProperties.xml \

Modified: trunk/MonoDevelop/Core/build/data/resources/css/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/build/data/resources/css/Makefile.am	2004-07-05 06:23:15 UTC (rev 1895)
+++ trunk/MonoDevelop/Core/build/data/resources/css/Makefile.am	2004-07-05 18:40:45 UTC (rev 1896)
@@ -1,5 +1,5 @@
 
-monodevelopdir = $(prefix)/lib/monodevelop
+monodevelopdir = $(libdir)/monodevelop
 cssdir = $(monodevelopdir)/data/resources/css
 
 css_DATA = MsdnHelp.css SharpDevelopStandard.css

Modified: trunk/MonoDevelop/Core/build/data/resources/icons/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/build/data/resources/icons/Makefile.am	2004-07-05 06:23:15 UTC (rev 1895)
+++ trunk/MonoDevelop/Core/build/data/resources/icons/Makefile.am	2004-07-05 18:40:45 UTC (rev 1896)
@@ -1,5 +1,5 @@
 
-monodevelopdir = $(prefix)/lib/monodevelop
+monodevelopdir = $(libdir)/monodevelop
 iconsdir = $(monodevelopdir)/data/resources/icons
 
 icons_DATA = C\#.File.EmptyFile \

Modified: trunk/MonoDevelop/Core/gdldock/gdl/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/gdldock/gdl/Makefile.am	2004-07-05 06:23:15 UTC (rev 1895)
+++ trunk/MonoDevelop/Core/gdldock/gdl/Makefile.am	2004-07-05 18:40:45 UTC (rev 1896)
@@ -39,7 +39,7 @@
 	&& cp -p $(ASSEMBLY) ../../build/bin/. \
 	&& cp -p $(srcdir)/$(ASSEMBLY).config ../../build/bin/.
 
-gdldocklibdir = $(prefix)/lib/monodevelop/bin
+gdldocklibdir = $(libdir)/monodevelop/bin
 gdldocklib_DATA = $(ASSEMBLY) $(ASSEMBLY).config
 
 clean-local:

Modified: trunk/MonoDevelop/Core/gdldock/sources/gdl/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/gdldock/sources/gdl/Makefile.am	2004-07-05 06:23:15 UTC (rev 1895)
+++ trunk/MonoDevelop/Core/gdldock/sources/gdl/Makefile.am	2004-07-05 18:40:45 UTC (rev 1896)
@@ -4,7 +4,7 @@
 	-DGDL_IMAGESDIR=\"$(srcdir)/.\"			\
 	$(GDLDOCK_CFLAGS)
 
-gdldocklibdir = $(prefix)/lib/monodevelop/bin
+gdldocklibdir = $(libdir)/monodevelop/bin
 gdldocklib_DATA = $(dist_gdldocklib)
 
 gdldocklib_LTLIBRARIES = libgdldock.la

Modified: trunk/MonoDevelop/Core/monodevelop.in
===================================================================
--- trunk/MonoDevelop/Core/monodevelop.in	2004-07-05 06:23:15 UTC (rev 1895)
+++ trunk/MonoDevelop/Core/monodevelop.in	2004-07-05 18:40:45 UTC (rev 1896)
@@ -27,7 +27,7 @@
 	exit 1
 fi
  
-MD_BIN_PATH=@prefix@/lib/monodevelop/bin
+MD_BIN_PATH=@libdir@/monodevelop/bin
 
 if [ -n $LD_LIBRARY_PATH ]; then
 	export LD_LIBRARY_PATH=$MOZILLA_HOME:$MD_BIN_PATH:$LD_LIBRARY_PATH
@@ -36,9 +36,9 @@
 fi
 
 if [ -n $PKG_CONFIG_PATH ]; then
-	export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:@gtksharp_prefix@/lib/pkgconfig/
+	export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:@libdir@/pkgconfig/
 else
-	export PKG_CONFIG_PATH=@gtksharp_prefix@/lib/pkgconfig/
+	export PKG_CONFIG_PATH=@libdir@/pkgconfig/
 fi
 
 export MOZILLA_FIVE_HOME=$MOZILLA_HOME

More information about the Monodevelop-patches-list mailing list