Re: new makefile for firefox

[guenther <guenther rudersport de>]

On Sat, 2005-10-01 at 14:14 -0400, Joseph E. Sacco, PhD wrote:
> Attached is a new Makefile for firefox that includes a post-install
> target that will link the nss/nspr libs to $(libdir).
> 
> evolution-webcal can now be built using the old Makefile.

Can confirm this. :-)  Probably fixes the gnomemeeting issue as well.


The Firefox post-install works, so we don't need the gross [1] hack
introduced in GARNOME 2.12.0.2 for evolution-webcal any longer. Attached
is a patch to revert this hack (applies to GARNOME 2.12.0.2 only, any
earlier version is fine without this patch).

However, your new Makefile has a typo [2] -- libssl3 should rather be
libssl3.so. Easy to adjust for anyone given your last post. Anyway,
attached is a patch for Firefox against GARNOME 2.12.0.2 (should apply
to earlier version as well, regardless of the Firefox version bump to
1.0.7 in 2.12.0.2).


Still a hack, though -- granted, I love hacks. ;)  I'd like to get rid
of most of the additional (and necessary) post-install hacks altogether.
Which would require upstream fixes. As it is now, we're forced to hack
our way...

...guenther


[1] It's gross, cause altering LD_LIBRARY_PATH and sticking to the
default build target didn't work for some strange reason...

[2] Obviously, this isn't your day. ;)


-- 
char *t="\10pse\0r\0dtu\0  ghno\x4e\xc8\x79\xf4\xab\x51\x8a\x10\xf4\xf4\xc4";
main(){ char h,m=h=*t++,*x=t+2*h,c,i,l=*x,s=0; for (i=0;i<l;i++){ i%8? c<<=1:
(c=*++x); c&128 && (s+=h); if (!(h>>=1)||!t[s+h]){ putchar(t[s]);h=m;s=0; }}}

diff -ru desktop.orig/evolution-webcal/Makefile desktop/evolution-webcal/Makefile
--- desktop.orig/evolution-webcal/Makefile	2005-09-28 05:29:19.000000000 +0200
+++ desktop/evolution-webcal/Makefile	2005-10-01 22:24:35.000000000 +0200
@@ -12,14 +12,9 @@
 endef
 
 CONFIGURE_SCRIPTS = $(WORKSRC)/configure
-BUILD_SCRIPTS = custom
+BUILD_SCRIPTS = $(WORKSRC)/Makefile
 INSTALL_SCRIPTS = $(WORKSRC)/Makefile
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
 include ../category.mk
-
-FF_LIBRARY_PATH :=  `pkg-config --variable=libdir firefox-nss`:$(LD_LIBRARY_PATH)
-
-build-custom:
-LD_LIBRARY_PATH=$(FF_LIBRARY_PATH) $(MAKE) -C $(WORKSRC)

diff -ru bootstrap.orig/firefox/Makefile bootstrap/firefox/Makefile
--- bootstrap.orig/firefox/Makefile	2005-09-26 04:00:33.000000000 +0200
+++ bootstrap/firefox/Makefile	2005-10-01 22:24:54.000000000 +0200
@@ -38,3 +38,13 @@
 	@cp -f $(WORKSRC)/dist/public/nss/*.h $(includedir)/$(GARNAME)-$(GARVERSION)/nss/
 	@mkdir -p $(includedir)/$(GARNAME)-$(GARVERSION)/seccmd/
 	@cp -f $(WORKSRC)/dist/public/seccmd/*.h $(includedir)/$(GARNAME)-$(GARVERSION)/seccmd/
+
+post-install:
+	@echo "Set up links for FF libs..."
+	@LIB_LIST="libnspr4.so libnss3.so libnsskbi.so libplc4.so \
+	  libplds4.so libsmime3.so libsoftokn3.so libssl3.so"; \
+	for file in $$LIB_LIST; do \
+	  ln -sf $(libdir)/$(GARNAME)-$(GARVERSION)/$$file $(libdir); \
+	done
+	@$(MAKECOOKIE)
+