Author: atsushi
Date: 2008-02-07 02:14:28 -0500 (Thu, 07 Feb 2008)
New Revision: 95120
Modified:
trunk/olive/data/ChangeLog
trunk/olive/data/Makefile
Log:
2008-02-07 Atsushi Enomoto <[EMAIL PROTECTED]>
* Makefile : oops, do replace @olive35dir@ correctly.
Modified: trunk/olive/data/ChangeLog
===================================================================
--- trunk/olive/data/ChangeLog 2008-02-07 06:56:58 UTC (rev 95119)
+++ trunk/olive/data/ChangeLog 2008-02-07 07:14:28 UTC (rev 95120)
@@ -1,5 +1,9 @@
2008-02-07 Atsushi Enomoto <[EMAIL PROTECTED]>
+ * Makefile : oops, do replace @olive35dir@ correctly.
+
+2008-02-07 Atsushi Enomoto <[EMAIL PROTECTED]>
+
* Makefile : added olive35dir
* olive.pc.in : added -r:System.ServiceModel.Web.dll.
Modified: trunk/olive/data/Makefile
===================================================================
--- trunk/olive/data/Makefile 2008-02-07 06:56:58 UTC (rev 95119)
+++ trunk/olive/data/Makefile 2008-02-07 07:14:28 UTC (rev 95120)
@@ -7,7 +7,7 @@
olive35dir := $(shell cygpath -m '$(prefix)/lib/mono/3.5')
else
olivedir = $(prefix)/lib/mono/3.0
- olive35dir = $(prefix)/lib/mono/3.5
+ olive35dir = $(prefix)/lib/mono/3.5
silverdir = $(prefix)/lib/mono/2.1
endif
@@ -18,7 +18,9 @@
REWRITE=
olive.pc: olive.pc.in Makefile
sed -e "s,@olivedir@,$(olivedir),g" -e "s,@VERSION@,$(MONO_VERSION),g"
< olive.pc.in > [EMAIL PROTECTED]
- mv [EMAIL PROTECTED] $@
+ sed -e "s,@olive35dir@,$(olive35dir),g" -e
"s,@VERSION@,$(MONO_VERSION),g" < [EMAIL PROTECTED] > [EMAIL PROTECTED]
+ mv [EMAIL PROTECTED] $@
+ rm [EMAIL PROTECTED]
silver.pc: silver.pc.in Makefile
sed -e "s,@silverdir@,$(silverdir),g" -e
"s,@VERSION@,$(MONO_VERSION),g" < silver.pc.in > [EMAIL PROTECTED]
@@ -30,11 +32,15 @@
silverdesktop.pc: silverdesktop.pc.in Makefile
sed -e "s,@olivedir@,$(olivedir),g" -e "s,@VERSION@,$(MONO_VERSION),g"
< silverdesktop.pc.in > [EMAIL PROTECTED]
- mv [EMAIL PROTECTED] $@
+ sed -e "s,@olive35dir@,$(olive35dir),g" -e
"s,@VERSION@,$(MONO_VERSION),g" < [EMAIL PROTECTED] > [EMAIL PROTECTED]
+ mv [EMAIL PROTECTED] $@
+ rm [EMAIL PROTECTED]
agmono.pc: agmono.pc.in Makefile
sed -e "s,@olivedir@,$(olivedir),g" -e "s,@VERSION@,$(MONO_VERSION),g"
< agmono.pc.in > [EMAIL PROTECTED]
- mv [EMAIL PROTECTED] $@
+ sed -e "s,@olive35dir@,$(olive35dir),g" -e
"s,@VERSION@,$(MONO_VERSION),g" < [EMAIL PROTECTED] > [EMAIL PROTECTED]
+ mv [EMAIL PROTECTED] $@
+ rm [EMAIL PROTECTED]
install-local: olive.pc silver.pc silverdesktop.pc agmono.pc agmonosilver.pc
$(MKINSTALLDIRS) $(DESTDIR)$(prefix)/lib/pkgconfig
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
