Author: benm
Date: 2005-05-12 14:32:20 -0400 (Thu, 12 May 2005)
New Revision: 44456
Modified:
trunk/gtkmozembed-sharp/ChangeLog
trunk/gtkmozembed-sharp/configure.in
trunk/gtkmozembed-sharp/doc/ChangeLog
trunk/gtkmozembed-sharp/doc/Makefile.am
trunk/gtkmozembed-sharp/gecko-sharp-2.0.pc.in
trunk/gtkmozembed-sharp/gtkmozembed/Makefile.am
trunk/gtkmozembed-sharp/sample/Makefile.am
trunk/gtkmozembed-sharp/sample/webshot.in
Log:
In .:
2005-05-12 Ben Maurer <[EMAIL PROTECTED]>
* sample/Makefile.am: Correct the install dir, and remove sed
stuff.
* sample/webshot.in: Use prefix/lib, and give the full path to mono.
* gecko-sharp-2.0.pc.in: use prefix/lib
* gtkmozembed/Makefile.am: use GACUTIL_FLAGS
* configure.in:
- Add GACUTIL_FLAGS with prefix/lib rather than libdir
- sample/webshot is now created by configure
In doc:
2005-05-12 Ben Maurer <[EMAIL PROTECTED]>
* Makefile.am: Handle destdir correctly.
Modified: trunk/gtkmozembed-sharp/ChangeLog
===================================================================
--- trunk/gtkmozembed-sharp/ChangeLog 2005-05-12 17:41:42 UTC (rev 44455)
+++ trunk/gtkmozembed-sharp/ChangeLog 2005-05-12 18:32:20 UTC (rev 44456)
@@ -1,3 +1,18 @@
+2005-05-12 Ben Maurer <[EMAIL PROTECTED]>
+
+ * sample/Makefile.am: Correct the install dir, and remove sed
+ stuff.
+
+ * sample/webshot.in: Use prefix/lib, and give the full path to mono.
+
+ * gecko-sharp-2.0.pc.in: use prefix/lib
+
+ * gtkmozembed/Makefile.am: use GACUTIL_FLAGS
+
+ * configure.in:
+ - Add GACUTIL_FLAGS with prefix/lib rather than libdir
+ - sample/webshot is now created by configure
+
2005-05-09 Mark Crichton <[EMAIL PROTECTED]>
* gtkmozembed/Makefile.am: added the XML api file to the dist, so
Modified: trunk/gtkmozembed-sharp/configure.in
===================================================================
--- trunk/gtkmozembed-sharp/configure.in 2005-05-12 17:41:42 UTC (rev
44455)
+++ trunk/gtkmozembed-sharp/configure.in 2005-05-12 18:32:20 UTC (rev
44456)
@@ -125,6 +125,8 @@
AC_MSG_ERROR([No gacutil tool found])
fi
+GACUTIL_FLAGS='/package gecko-sharp-2.0 /gacdir $(DESTDIR)$(prefix)/lib'
+
winbuild=no
case "$host" in
*-*-mingw*|*-*-cygwin*)
@@ -142,6 +144,7 @@
gtkmozembed/AssemblyInfo.cs
doc/Makefile
sample/Makefile
+sample/webshot
sources/Makefile
gecko-sharp-2.0.pc
])
Modified: trunk/gtkmozembed-sharp/doc/ChangeLog
===================================================================
--- trunk/gtkmozembed-sharp/doc/ChangeLog 2005-05-12 17:41:42 UTC (rev
44455)
+++ trunk/gtkmozembed-sharp/doc/ChangeLog 2005-05-12 18:32:20 UTC (rev
44456)
@@ -1,3 +1,7 @@
+2005-05-12 Ben Maurer <[EMAIL PROTECTED]>
+
+ * Makefile.am: Handle destdir correctly.
+
2005-05-01 Mark Crichton <[EMAIL PROTECTED]>
* en/GtkSharp.GeckoSharp: Removed, for it is worthless.
Modified: trunk/gtkmozembed-sharp/doc/Makefile.am
===================================================================
--- trunk/gtkmozembed-sharp/doc/Makefile.am 2005-05-12 17:41:42 UTC (rev
44455)
+++ trunk/gtkmozembed-sharp/doc/Makefile.am 2005-05-12 18:32:20 UTC (rev
44456)
@@ -1,14 +1,6 @@
if ENABLE_MONODOC
-TARGETS = gecko-sharp-docs.zip gecko-sharp-docs.tree gecko-sharp-docs.source
-DOCDIR = `$(MONODOC) --get-sourcesdir`
-
-install-data-local:
- install -m 644 $(srcdir)/gecko-sharp-docs.source `monodoc
--get-sourcesdir`
- install -m 644 $(srcdir)/gecko-sharp-docs.tree `monodoc
--get-sourcesdir`
- install -m 644 $(srcdir)/gecko-sharp-docs.zip `monodoc --get-sourcesdir`
-else
-TARGETS =
-DOCDIR = $(datadir)
+docdir = `$(MONODOC) --get-sourcesdir`
+doc_DATA = gecko-sharp-docs.zip gecko-sharp-docs.tree gecko-sharp-docs.source
endif
noinst_DATA = $(TARGETS)
Modified: trunk/gtkmozembed-sharp/gecko-sharp-2.0.pc.in
===================================================================
--- trunk/gtkmozembed-sharp/gecko-sharp-2.0.pc.in 2005-05-12 17:41:42 UTC
(rev 44455)
+++ trunk/gtkmozembed-sharp/gecko-sharp-2.0.pc.in 2005-05-12 18:32:20 UTC
(rev 44456)
@@ -6,4 +6,4 @@
Description: Gecko# - A Gtk# Mozilla binding
Version: @VERSION@
Requires: gtk-sharp-2.0
-Libs: -r:${libdir}/mono/gecko-sharp-2.0/gecko-sharp.dll
+Libs: -r:${prefix}/lib/mono/gecko-sharp-2.0/gecko-sharp.dll
Modified: trunk/gtkmozembed-sharp/gtkmozembed/Makefile.am
===================================================================
--- trunk/gtkmozembed-sharp/gtkmozembed/Makefile.am 2005-05-12 17:41:42 UTC
(rev 44455)
+++ trunk/gtkmozembed-sharp/gtkmozembed/Makefile.am 2005-05-12 18:32:20 UTC
(rev 44456)
@@ -42,11 +42,11 @@
$(build_sources) generated/*.cs -out:gecko-sharp.dll
install-data-local:
- echo "$(GACUTIL) /i $(ASSEMBLY) /f /package gecko-sharp-2.0 /root
$(DESTDIR)$(libdir)"; \
- $(GACUTIL) /i $(ASSEMBLY) /f /package gecko-sharp-2.0 /root
$(DESTDIR)$(libdir) || exit 1;
+ echo "$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS)"; \
+ $(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1;
uninstall-local:
- echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package gecko-sharp-2.0 /root
$(DESTDIR)$(libdir)"; \
- $(GACUTIL) /u $(ASSEMBLY_NAME) /package gecko-sharp-2.0 /root
$(DESTDIR)$(libdir) || exit 1;
+ echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \
+ $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1;
EXTRA_DIST = $(RAW_API) $(sources) $(customs) $(METADATA) AssemblyInfo.cs.in
gecko-sharp.dll.config.in $(API)
Modified: trunk/gtkmozembed-sharp/sample/Makefile.am
===================================================================
--- trunk/gtkmozembed-sharp/sample/Makefile.am 2005-05-12 17:41:42 UTC (rev
44455)
+++ trunk/gtkmozembed-sharp/sample/Makefile.am 2005-05-12 18:32:20 UTC (rev
44456)
@@ -1,15 +1,11 @@
EXTRA_DIST = GtkMozApp.cs MozWindow.cs webshot.in WebThumbnailer.cs
-CLEANFILES = GtkMozApp.exe WebThumbnailer.exe webshot
+CLEANFILES = GtkMozApp.exe WebThumbnailer.exe
bin_SCRIPTS = webshot
-exedir = $(libdir)/gecko-sharp
+exedir = $(prefix)/lib/gecko-sharp-2.0
exe_DATA = WebThumbnailer.exe
-webshot: webshot.in
- sed -e '[EMAIL PROTECTED]@^$(libdir)^g' < $(srcdir)/webshot.in >
webshot.tmp \
- && mv webshot.tmp webshot
-
all: GtkMozApp.exe WebThumbnailer.exe
GtkMozApp.exe: $(srcdir)/GtkMozApp.cs $(srcdir)/MozWindow.cs
Modified: trunk/gtkmozembed-sharp/sample/webshot.in
===================================================================
--- trunk/gtkmozembed-sharp/sample/webshot.in 2005-05-12 17:41:42 UTC (rev
44455)
+++ trunk/gtkmozembed-sharp/sample/webshot.in 2005-05-12 18:32:20 UTC (rev
44456)
@@ -1,2 +1,2 @@
#!/bin/sh
-exec mono @libdir@/gecko-sharp/WebThumbnailer.exe
+exec @MONO@ @prefix@/lib/gecko-sharp-2.0/WebThumbnailer.exe
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
