Attachment 147894 Details for Bug 204589 – hopefully the final patch

[patch] hopefully the final patch

seamonkey-config-3.patch (text/plain), 2.52 KB, created by Martin Stransky on 2007-02-12 14:41:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Stransky

Created: 2007-02-12 14:41:13 UTC

Size: 2.52 KB

patch

obsolete

>--- mozilla/config/autoconf.mk.in.old	2007-02-12 12:37:06.000000000 +0100
>+++ mozilla/config/autoconf.mk.in	2007-02-12 12:37:06.000000000 +0100
>@@ -56,13 +56,13 @@
> prefix		= @prefix@
> exec_prefix	= @exec_prefix@
> bindir		= @bindir@
>-includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
>+includedir	= @includedir@/$(MOZ_PREFIX)$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
> libdir		= @libdir@
> datadir		= @datadir@
> mandir		= @mandir@
>-idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
>+idldir		= @datadir@/idl/$(MOZ_PREFIX)$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
> 
>-mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
>+mozappdir	= $(libdir)/$(MOZ_PREFIX)$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
> mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
> mrelibdir	= $(mredir)/lib
> 
>--- mozilla/build/unix/Makefile.in.old	2005-07-07 20:24:39.000000000 +0200
>+++ mozilla/build/unix/Makefile.in	2007-02-12 12:48:39.000000000 +0100
>@@ -40,6 +40,9 @@
> topsrcdir	= @top_srcdir@
> srcdir		= @srcdir@
> VPATH		= @srcdir@
>+MOZ_PREFIX_APP  = "mozilla"
>+MOZ_PREFIX	= "$(MOZ_PREFIX_APP)-"
>+MOZ_DEV_VERSION = `../../config/milestone.pl --topsrcdir='../..'`
> 
> include $(DEPTH)/config/autoconf.mk
> 
>@@ -69,7 +72,9 @@
> 
> pkg_config_files=$(MOZ_APP_NAME)-nspr.pc $(MOZ_APP_NAME)-xpcom.pc \
> 	$(MOZ_APP_NAME)-js.pc $(MOZ_APP_NAME)-gtkmozembed.pc \
>-	$(MOZ_APP_NAME)-nss.pc $(MOZ_APP_NAME)-plugin.pc
>+	$(MOZ_APP_NAME)-nss.pc $(MOZ_APP_NAME)-plugin.pc \
>+	$(MOZ_PREFIX_APP)-nspr.pc $(MOZ_PREFIX_APP)-xpcom.pc $(MOZ_PREFIX_APP)-js.pc \
>+	$(MOZ_PREFIX_APP)-gtkmozembed.pc $(MOZ_PREFIX_APP)-nss.pc $(MOZ_PREFIX_APP)-plugin.pc
> 
> GARBAGE	= $(pkg_config_files) mozilla-config
> 
>@@ -80,7 +85,7 @@
> 	-e "s|%includedir%|$(includedir)|" \
> 	-e "s|%libdir%|$(mozappdir)|" \
> 	-e "s|%idldir%|$(idldir)|" \
>-	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
>+	-e "s|%MOZILLA_VERSION%|$(MOZ_DEV_VERSION)|" \
> 	-e "s|%DEFS%|$(_DEFS)|" \
> 	-e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \
> 	-e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" > $@
>@@ -93,7 +98,7 @@
> 	-e "s|%libdir%|$(mozappdir)|" \
> 	-e "s|%idldir%|$(idldir)|" \
> 	-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
>-	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
>+	-e "s|%MOZILLA_VERSION%|$(MOZ_DEV_VERSION)|" \
> 	-e "s|%SUPERWIN_LIBS%|$(SUPERWIN_LIBS)|" \
> 	-e "s|%DEFS%|$(_DEFS)|" \
> 	-e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \
>@@ -101,6 +106,9 @@
> 	-e "s|%NSPR_NAME%|$(NSPR_NAME)|" \
> 	-e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" > $@
> 
>+$(MOZ_PREFIX_APP)-%.pc : $(MOZ_APP_NAME)-%.pc
>+	cp $< $@
>+
> libs:: $(MOZ_APP_NAME)-config
> 	chmod 755 $<
> 	$(INSTALL) -m 755 $< $(DIST)/bin

Actions: View | Diff

Attachments on bug 204589: 142177 | 147107 | 147677 | 147894