r7406 - mugshot-client/trunk/linux

[commits mugshot org]

Author: walters
Date: 2008-04-02 12:41:25 -0500 (Wed, 02 Apr 2008)
New Revision: 7406

Modified:
   mugshot-client/trunk/linux/Makefile-libhippofirefox.am
   mugshot-client/trunk/linux/Makefile-libstacker.am
   mugshot-client/trunk/linux/configure.ac
Log:
Install fx extension in right dir, distcheck fixes, new tarball version.


Modified: mugshot-client/trunk/linux/Makefile-libhippofirefox.am
===================================================================
--- mugshot-client/trunk/linux/Makefile-libhippofirefox.am	2008-03-31 21:57:02 UTC (rev 7405)
+++ mugshot-client/trunk/linux/Makefile-libhippofirefox.am	2008-04-02 17:41:25 UTC (rev 7406)
@@ -1,7 +1,13 @@
 FIREFOX_SRCDIR = $(COMMONSRCDIR)/firefox
 GECKO_PRIVATE_INCLUDEDIR=$(FIREFOX_SRCDIR)/gecko-private/include
+EXTENSION_ID = firefox mugshot org
+FIREFOX_APPID = {ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 
+if USE_XULRUNNER
+extensiondir=$(libdir)/mozilla/extensions/$(FIREFOX_APPID)/$(EXTENSION_ID)
+else
 extensiondir=$(pkglibdir)/firefox
+endif
 EXTENSION_SRCDIR=$(FIREFOX_SRCDIR)/extension
 extension_DATA =				\
 	$(EXTENSION_SRCDIR)/chrome.manifest	\

Modified: mugshot-client/trunk/linux/Makefile-libstacker.am
===================================================================
--- mugshot-client/trunk/linux/Makefile-libstacker.am	2008-03-31 21:57:02 UTC (rev 7405)
+++ mugshot-client/trunk/linux/Makefile-libstacker.am	2008-04-02 17:41:25 UTC (rev 7406)
@@ -130,7 +130,8 @@
 CSS_STYLESHEETS = \
 	$(COMMONSRCDIR)/stacker/stacker.css
 
-pkgdata_DATA += $(CSS_STYLESHEETS)
+cssdir=$(pkgdatadir)
+css_DATA = $(CSS_STYLESHEETS)
 EXTRA_DIST += $(CSS_STYLESHEETS)
 
 ## we need to nodist these because otherwise automake would copy 
@@ -143,3 +144,4 @@
 	mkdir $(distdir)/common-dist/stacker/generated
 	cp $(LIBSTACKER_SOURCEFILES) $(distdir)/common-dist/stacker
 	cp $(COMMONSRCDIR)/stacker/hippo-stacker-marshal.list $(distdir)/common-dist/stacker
+	cp $(COMMONSRCDIR)/stacker/stacker.css $(distdir)/common-dist/stacker

Modified: mugshot-client/trunk/linux/configure.ac
===================================================================
--- mugshot-client/trunk/linux/configure.ac	2008-03-31 21:57:02 UTC (rev 7405)
+++ mugshot-client/trunk/linux/configure.ac	2008-04-02 17:41:25 UTC (rev 7406)
@@ -6,7 +6,7 @@
 
 AC_CANONICAL_TARGET
 
-AM_INIT_AUTOMAKE(mugshot, 1.1.90)
+AM_INIT_AUTOMAKE(mugshot, 1.1.93)
 
 AM_CONFIG_HEADER(config/config.h)
 
@@ -461,6 +461,7 @@
     fi
 done
 
+AM_CONDITIONAL(USE_XULRUNNER, test "x${have_xulrunner}" = "xtrue")
 if test "x${have_xulrunner}" = "xtrue"; then
     AC_MSG_RESULT([yes])
     AC_DEFINE(HAVE_XULRUNNER, 1, [whether we have XULRunner])