X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=Makefile;h=ddfa5aa40deb3c1b7e2ce00011e3d428eae43fc6;hb=1de4c6f705d5bc77a6a807ce7964f3f4bb6c9af7;hp=9a62d7e2be49e66ebe55aaa3ecf06c2bfa37291e;hpb=1363abe723ead6b64896ccd0e7875c4ae8bca706;p=videolink.git

diff --git a/Makefile b/Makefile
index 9a62d7e..ddfa5aa 100644
--- a/Makefile
+++ b/Makefile
@@ -77,7 +77,7 @@ clean :
 
 install :
 	mkdir -p -m 755 $(DESTDIR)$(bindir)
-	install -m 755 -s videolink $(DESTDIR)$(bindir)
+	install -m 755 $(if $(NDEBUG),-s,) videolink $(DESTDIR)$(bindir)
 	mkdir -p -m 755 $(DESTDIR)$(docdir)/videolink
 	gzip -c9 README >$(DESTDIR)$(docdir)/videolink/README.gz
 	gzip -c9 ChangeLog >$(DESTDIR)$(docdir)/videolink/ChangeLog.gz
@@ -99,7 +99,8 @@ $(sources_using_gtkmm:%.cpp=.objs/%.o) \
     : CPPFLAGS += $(shell pkg-config --cflags gtkmm-2.4)
 
 $(sources_using_moz:%.cpp=.objs/%.o) \
-    : CPPFLAGS += $(shell pkg-config --cflags $(moz_pc)) $(moz_cppflags_extra)
+    : CPPFLAGS += $(filter-out -fshort-wchar, \
+		    $(shell pkg-config --cflags $(moz_pc)) $(moz_cppflags_extra))
 # Non-virtual destructors are fine in XPCOM interface classes since
 # instances are only ever called by the Release function which is virtual.
 $(sources_using_moz:%.cpp=.objs/%.o) : CXXFLAGS += -Wno-non-virtual-dtor