Made proper use of DESTDIR for installation.

[videolink.git] / Makefile

diff --git a/Makefile b/Makefile
index 671ba39eb54822373cb10e0df8994ce41a1da9f7..069a59fa8a2114f26dd4f12b55bc8220058d4af3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,9 @@
 prefix := /usr/local
 
-videolink_lib_dir := $(prefix)/lib/videolink
+bindir := $(prefix)/bin
+sharedir := $(prefix)/share
+docdir := $(sharedir)/doc
+mandir := $(sharedir)/man
 
 moz_include_dir := \
     $(shell pkg-config --variable=prefix mozilla-gtkmozembed)/include/mozilla
@@ -14,11 +17,9 @@ moz_version_major := $(word 1,$(subst ., ,$(moz_version)))
 moz_version_minor := $(word 2,$(subst ., ,$(moz_version)))
 moz_version_patchlevel := $(word 3,$(subst ., ,$(moz_version)))
 
-CFLAGS := -ansi -Wall
+CFLAGS := -ansi -Wall -Wunused -Wno-unused-parameter
 CPPFLAGS := -D_REENTRANT
-# Non-virtual destructors are fine in XPCOM interface classes since
-# instances are only ever called by the Release function which is virtual.
-CXXFLAGS := -ansi -Wall -Wno-non-virtual-dtor
+CXXFLAGS := -ansi -Wall -Wunused
 LDFLAGS := -lpthread $(shell pkg-config --libs gtkmm-2.0 mozilla-gtkmozembed) \
            -Wl,-rpath -Wl,$(moz_lib_dir) -lexpat
 
@@ -44,20 +45,25 @@ clean :
        rm -rf .objs
        rm -f videolink *~ .\#* *.orig *.rej svn-commit*.tmp
 
-distclean : clean
-       rm -rf .svn
-
 install :
-       mkdir -p -m 755 $(prefix)/bin $(videolink_lib_dir)
-       install -m 755 -s videolink $(prefix)/bin
-       install -m 644 videolink.css $(videolink_lib_dir)
-
-.PHONY : clean distclean install
+       mkdir -p -m 755 $(DESTDIR)$(bindir)
+       install -m 755 -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
+       chmod 644 $(DESTDIR)$(docdir)/videolink/*.gz
+       mkdir -p -m 755 $(DESTDIR)$(mandir)/man1
+       gzip -c9 videolink.1 >$(DESTDIR)$(mandir)/man1/videolink.1.gz
+       chmod 644 $(DESTDIR)$(mandir)/man1/videolink.1.gz
+       mkdir -p -m 755 $(DESTDIR)$(sharedir)/videolink
+       install -m 644 videolink.css $(DESTDIR)$(sharedir)/videolink
+
+.PHONY : clean install
 
 .objs/browser_widget.% : CPPFLAGS += -DMOZ_LIB_DIR='"$(moz_lib_dir)"'
 
 .objs/videolink.% \
-    : CPPFLAGS += -DVIDEOLINK_LIB_DIR='"$(videolink_lib_dir)"'       \
+    : CPPFLAGS += -DVIDEOLINK_SHARE_DIR='"$(sharedir)/videolink"'    \
                   -DMOZ_VERSION_MAJOR=$(moz_version_major)           \
                   -DMOZ_VERSION_MINOR=$(moz_version_minor)           \
                   -DMOZ_VERSION_PATCHLEVEL=$(moz_version_patchlevel)
@@ -70,6 +76,12 @@ install :
 .objs/null_prompt_service.% .objs/style_sheets.% .objs/videolink.%  \
 .objs/xpcom_support.%                                               \
     : CPPFLAGS += $(shell pkg-config --cflags mozilla-gtkmozembed)
+# Non-virtual destructors are fine in XPCOM interface classes since
+# instances are only ever called by the Release function which is virtual.
+.objs/browser_widget.% .objs/child_iterator.% .objs/link_iterator.% \
+.objs/null_prompt_service.% .objs/style_sheets.% .objs/videolink.%  \
+.objs/xpcom_support.%                                               \
+    : CXXFLAGS += -Wno-non-virtual-dtor
 
 # These dig a bit deeper into Mozilla
 .objs/link_iterator.% .objs/style_sheets.% .objs/videolink.%               \