Permalink
Browse files

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

	* sample/Makefile.am, configure.in, sample/webshot.in: Remove
	install of the webshot app. The bin file conflicts with the Gtk#
	1.0 based version.

	* Makefile.am (pkgconfigdir): Use the $datadir pkgconfig dir. This
	forces some distros with old pkgconfig's to modify their
	patch. However, it avoids breaking newer OS's with a new pkgconfig
	going forward.


svn path=/trunk/gtkmozembed-sharp/; revision=44509
  • Loading branch information...
1 parent 49ef66d commit 81fa97c166a41884275de860203109f62dbc0ed5 Ben Maurer committed May 13, 2005
Showing with 17 additions and 11 deletions.
  1. +11 −0 ChangeLog
  2. +4 −1 Makefile.am
  3. +0 −1 configure.in
  4. +2 −7 sample/Makefile.am
  5. +0 −2 sample/webshot.in
View
11 ChangeLog
@@ -1,3 +1,14 @@
+2005-05-13 Ben Maurer <bmaurer@ximian.com>
+
+ * sample/Makefile.am, configure.in, sample/webshot.in: Remove
+ install of the webshot app. The bin file conflicts with the Gtk#
+ 1.0 based version.
+
+ * Makefile.am (pkgconfigdir): Use the $datadir pkgconfig dir. This
+ forces some distros with old pkgconfig's to modify their
+ patch. However, it avoids breaking newer OS's with a new pkgconfig
+ going forward.
+
2005-05-12 Ben Maurer <bmaurer@ximian.com>
* sample/Makefile.am: Correct the install dir, and remove sed
View
5 Makefile.am
@@ -1,6 +1,9 @@
SUBDIRS = sources gtkmozembed doc sample
-pkgconfigdir = $(libdir)/pkgconfig
+# Only newer versions of pkgconfig support stuff being in datadir. People
+# using distros that have not backported the patch or have not upgraded
+# pkgconfig might need to add something to their pkgconfig path.
+pkgconfigdir = $(datadir)/pkgconfig
pkgconfig_DATA = gecko-sharp-2.0.pc
EXTRA_DIST = gecko-sharp-2.0.pc LICENSE.LGPL LICENSE.MPL gecko-sharp.pub gecko-sharp.snk
View
1 configure.in
@@ -145,7 +145,6 @@ gtkmozembed/Makefile
gtkmozembed/AssemblyInfo.cs
doc/Makefile
sample/Makefile
-sample/webshot
sources/Makefile
gecko-sharp-2.0.pc
])
View
9 sample/Makefile.am
@@ -1,11 +1,6 @@
-EXTRA_DIST = GtkMozApp.cs MozWindow.cs webshot.in WebThumbnailer.cs
+EXTRA_DIST = GtkMozApp.cs MozWindow.cs WebThumbnailer.cs
CLEANFILES = GtkMozApp.exe WebThumbnailer.exe
-bin_SCRIPTS = webshot
-
-exedir = $(prefix)/lib/mono/gecko-sharp-2.0
-exe_DATA = WebThumbnailer.exe
-
all: GtkMozApp.exe WebThumbnailer.exe
GtkMozApp.exe: $(srcdir)/GtkMozApp.cs $(srcdir)/MozWindow.cs
@@ -14,7 +9,7 @@ GtkMozApp.exe: $(srcdir)/GtkMozApp.cs $(srcdir)/MozWindow.cs
-r:gecko-sharp.dll \
-lib:$(GTKSHARP_PREFIX)/lib \
-pkg:gtk-sharp-2.0 \
- -r:System.Drawing \
+ -r:System.Drawing.dll \
-out:GtkMozApp.exe $(srcdir)/GtkMozApp.cs $(srcdir)/MozWindow.cs
WebThumbnailer.exe: $(srcdir)/WebThumbnailer.cs
View
2 sample/webshot.in
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec @MONO@ @prefix@/lib/mono/gecko-sharp-2.0/WebThumbnailer.exe

0 comments on commit 81fa97c

Please sign in to comment.