File bonjourfoxy-0.8.0.diff of Package firefox-ext-bonjourfoxy

Index: bonjourfoxy-0.8.0_git201010072141/src/Makefile.nix
===================================================================
--- bonjourfoxy-0.8.0_git201010072141.orig/src/Makefile.nix
+++ bonjourfoxy-0.8.0_git201010072141/src/Makefile.nix
@@ -31,7 +31,7 @@ INSTALL_FILES = /install.rdf \
                 /locale/de-DE/bonjourfoxy.properties \
                 /locale/de-DE/bonjourfoxy.dtd \
                 /locale/en-US/welcome.html \
-                /lib/${FF_MAJOR_VER}/BFDNSSDService.so \
+                /lib/${FF_MAJOR_VER}/BFDNSSDService$(SUFFIX).so \
                 /chrome.manifest \
                 /content/list.css \
                 /content/options.xul \
@@ -73,6 +73,9 @@ else ifeq (exists,$(shell test -d ${LIB_
 else ifeq (exists,$(shell test -d ${LIB_PATH}/firefox-${FF_FULL_VER}/extensions && echo exists))
     EXTENSION_ID_SUFFIX = firefox-${FF_MAJOR_VER}.bonjourfoxy.net
     EXTENSIONS_PATH = ${LIB_PATH}/firefox-${FF_FULL_VER}/extensions
+else ifeq (exists,$(shell test -d ${LIB_PATH}/firefox/extensions && echo exists))
+    EXTENSION_ID_SUFFIX = firefox-${FF_MAJOR_VER}.bonjourfoxy.net
+    EXTENSIONS_PATH = ${LIB_PATH}/firefox/extensions
 endif
 EXTENSION_ID = bonjourfoxy@${EXTENSION_ID_SUFFIX}
 EEXTENSION_ID = bonjourfoxy\@${EXTENSION_ID_SUFFIX}
@@ -83,12 +86,12 @@ AVAHI_INCLUDES = $(shell pkg-config --cf
 AVAHI_LIBS = $(shell pkg-config --libs avahi-compat-libdns_sd)
 
 # XR includes
-XR_INCLUDES = $(shell pkg-config --cflags libxul libxul-unstable)
-XR_LIBS = $(shell pkg-config --libs libxul libxul-unstable)
+XR_INCLUDES = $(shell pkg-config --cflags libxul)
+XR_LIBS = $(shell pkg-config --libs libxul)
 XR_IDL_PATH = $(shell pkg-config --variable=idldir libxul)
-IDL_INCLUDES = -I ${XR_IDL_PATH}/stable -I ${XR_IDL_PATH}/unstable
+IDL_INCLUDES = -I ${XR_IDL_PATH}
 #xpcom compiler path
-XPIDL = $(shell pkg-config --variable=sdkdir libxul-unstable)/bin/xpidl
+XPIDL = $(shell pkg-config --variable=sdkdir libxul)/bin/xpidl
 
 CFLAGS                = -fPIC
 LDFLAGS               = -Wl,-rpath-link,-fshort-wchar
@@ -107,7 +110,7 @@ BFDNSSDServiceModule$(SUFFIX).o: CBFDNSS
 	${CC} ${CFLAGS} -w -c -o $@ -I . $(XR_INCLUDES) -DXP_UNIX $(AVAHI_INCLUDES) CBFDNSSDServiceModule.cpp
 
 BFDNSSDService$(SUFFIX).so: BFDNSSDService$(SUFFIX).o BFDNSSDServiceModule$(SUFFIX).o
-	${CC} -shared -Wl,-z,defs $(AVAHI_LIBS) ${LDFLAGS} -dynamiclib -o $@ $^ $(XR_LIBS)
+	${CC} -shared -Wl,-z,defs ${LDFLAGS} -dynamiclib -o $@ $^ $(AVAHI_LIBS) $(XR_LIBS)
 
 clean:
 	rm -f ${ALL_OBJS}
Index: bonjourfoxy-0.8.0_git201010072141/Makefile
===================================================================
--- bonjourfoxy-0.8.0_git201010072141.orig/Makefile
+++ bonjourfoxy-0.8.0_git201010072141/Makefile
@@ -29,6 +29,7 @@ dir: xpcom
 	cp src/$(MIN_VER)/*.xpt src/*.js scratch/components
 	@for release in $(FF_RELS); do \
         mkdir -p scratch/lib/$$release && \
+        cp src/$$release/*.so scratch/lib/$$release 2>/dev/null|| echo "*.so for FF$$release missing" && \
         cp src/$$release/*.dll scratch/lib/$$release 2>/dev/null|| echo "*.dll for FF$$release missing" && \
         cp src/$$release/*-universal.dylib scratch/lib/$$release 2>/dev/null|| echo "*-universal.dylib for FF$$release missing"; \
     done
@@ -39,9 +40,8 @@ xpi: dir
 
 nixdir:
 	@echo Creating nix/bonjourfoxy-${BF_VER}
-	mkdir -p nix/bonjourfoxy-${BF_VER}/ext
 	mkdir -p nix/bonjourfoxy-${BF_VER}/src
-	cp -r ext/ nix/bonjourfoxy-${BF_VER}/ext/
+	cp -r ext nix/bonjourfoxy-${BF_VER}
 	perl -pi -e "s/%%VER%%/$(BF_VER)/g" nix/bonjourfoxy-${BF_VER}/ext/install.rdf
 	cp src/*.h nix/bonjourfoxy-${BF_VER}/src/
 	cp src/*.cpp nix/bonjourfoxy-${BF_VER}/src/