Skip to content
Browse files

In .:

2005-05-12  Ben Maurer  <bmaurer@ximian.com>

	* 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  <bmaurer@ximian.com>

	* Makefile.am: Handle destdir correctly.


svn path=/trunk/gtkmozembed-sharp/; revision=44456
  • Loading branch information...
1 parent 2f9ec06 commit ab46d153ef5e19385ff487a4e5898019e4cc9f38 Ben Maurer committed May 12, 2005
Showing with 32 additions and 22 deletions.
  1. +15 −0 ChangeLog
  2. +3 −0 configure.in
  3. +4 −0 doc/ChangeLog
  4. +2 −10 doc/Makefile.am
  5. +1 −1 gecko-sharp-2.0.pc.in
  6. +4 −4 gtkmozembed/Makefile.am
  7. +2 −6 sample/Makefile.am
  8. +1 −1 sample/webshot.in
View
15 ChangeLog
@@ -1,3 +1,18 @@
+2005-05-12 Ben Maurer <bmaurer@ximian.com>
+
+ * 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 <crichton@gimp.org>
* gtkmozembed/Makefile.am: added the XML api file to the dist, so
View
3 configure.in
@@ -125,6 +125,8 @@ if test "x$GACUTIL" = "xno" ; then
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/Makefile
gtkmozembed/AssemblyInfo.cs
doc/Makefile
sample/Makefile
+sample/webshot
sources/Makefile
gecko-sharp-2.0.pc
])
View
4 doc/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-12 Ben Maurer <bmaurer@ximian.com>
+
+ * Makefile.am: Handle destdir correctly.
+
2005-05-01 Mark Crichton <crichton@gimp.org>
* en/GtkSharp.GeckoSharp: Removed, for it is worthless.
View
12 doc/Makefile.am
@@ -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)
View
2 gecko-sharp-2.0.pc.in
@@ -6,4 +6,4 @@ Name: Gecko#
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
View
8 gtkmozembed/Makefile.am
@@ -42,11 +42,11 @@ gecko-sharp.dll: $(build_sources) generated-stamp gecko-sharp.snk
$(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)
View
8 sample/Makefile.am
@@ -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 's^\@libdir\@^$(libdir)^g' < $(srcdir)/webshot.in > webshot.tmp \
- && mv webshot.tmp webshot
-
all: GtkMozApp.exe WebThumbnailer.exe
GtkMozApp.exe: $(srcdir)/GtkMozApp.cs $(srcdir)/MozWindow.cs
View
2 sample/webshot.in
@@ -1,2 +1,2 @@
#!/bin/sh
-exec mono @libdir@/gecko-sharp/WebThumbnailer.exe
+exec @MONO@ @prefix@/lib/gecko-sharp-2.0/WebThumbnailer.exe

0 comments on commit ab46d15

Please sign in to comment.
Something went wrong with that request. Please try again.