Changeset 33c5f1ca68d9a1e7b15d73fb0ac2426b3d9ed2a5

Timestamp:

10/04/09 21:13:23 (3 years ago)

Author:

Antti-Juhani Kaijanaho <antti-juhani@…>

Children:

9c5f7175db6e59cc36754872c528b855cca420cc

Parents:

ebdbb95b9c4faab5eaac4aed755c07b6ae5ddeca

git-committer:

Antti-Juhani Kaijanaho <antti-juhani@…> (10/04/09 21:13:23)

Message:

Add an installation procedure

Signed-off-by: Antti-Juhani Kaijanaho <antti-juhani@…>

Files:

• GNUmakefile.in (modified) (3 diffs)
• alue.cfg.in (added)
• alue_posix.cc (modified) (1 diff)
• configure.ac (modified) (1 diff)
• test-alue.cfg (added)

GNUmakefile.in

@@ -16 +16 @@
          @BOOST_PROGRAM_OPTIONS_LIB@ @BOOST_THREAD_LIB@ \
          @GnuTLS_LIBS@
+DEFS = @DEFS@ -DCONFFILE=\"$(cfgfile)\"
 
-cc_src = $(filter-out %test.cc, $(wildcard *.cc */*.cc))
-test_src = $(wildcard *test.cc */*test.cc)
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_DATA = $(INSTALL) -m 644
+INSTALL_DIR = $(INSTALL) -d
+INSTALL_INFO = install-info
+
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+
+srcdir = @srcdir@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+datarootdir = @datarootdir@
+sysconfdir = @sysconfdir@
+localstatedir = @localstatedir@
+docdir = @docdir@
+infodir = @infodir@
+htmldir = @htmldir@
+pdfdir = @pdfdir@
+logdir = @localstatedir@/log
+pkgdatadir=$(datarootdir)/@PACKAGE_TARNAME@
+pkglocalstatedir=$(localstatedir)/state/@PACKAGE_TARNAME@
+pkgsysconfdir=$(sysconfdir)/$(PACKAGE_TARNAME)
+cfgfile = $(pkgsysconfdir)/alue.cfg
+
+cc_src = $(filter-out %test.cc, $(wildcard $(srcdir)/*.cc $(srcdir)/*/*.cc))
+test_src = $(wildcard $(srcdir)/*test.cc $(srcdir)/*/*test.cc)
 
 obj = $(cc_src:.cc=.o)
-test_obj = $(test_src:.cc=.o)
+test_obj = $(test_src:.cc=.o) $(filter-out $(srcdir)/alue_posix.o, $(obj))
 
-all : run-test alue | print-conf
+all : check alue | print-conf
 
 alue :  $(obj) | print-conf
@@ -29 +56 @@
         @$(CXX) $(LDFLAGS) -o $@ $(obj) $(LDLIBS)
 
-test : $(test_obj) $(filter-out alue_posix.o, $(obj)) | print-conf
-        @echo CXX LDFLAGS -o $@ $(test_obj) $(filter-out alue_posix.o, $(obj)) LDLIBS @BOOST_UNIT_TEST_FRAMEWORK_LIB@
-        @$(CXX) $(LDFLAGS) -o $@ $(test_obj) $(filter-out alue_posix.o, $(obj))\
-                 $(LDLIBS) @BOOST_UNIT_TEST_FRAMEWORK_LIB@
+test : $(test_obj) | print-conf
+        @echo CXX LDFLAGS -o $@ $(test_obj) LDLIBS \
+                @BOOST_UNIT_TEST_FRAMEWORK_LIB@
+        @$(CXX) $(LDFLAGS) -o $@ $(test_obj) $(LDLIBS) \
+                @BOOST_UNIT_TEST_FRAMEWORK_LIB@
 
-run-test: test | print-conf
+check: test | print-conf
         ./test
         touch $@
@@ -45 +73 @@
         @echo "LDFLAGS=$(LDLIBS)"
         @echo "LDLIBS=$(LDLIBS)"
+        @echo "DEFS=$(DEFS)"
+
+alue.cfg : alue.cfg.in GNUmakefile
+        sed -e 's|@logdir@|$(logdir)|g' \
+            -e 's|@pkgdatadir@|$(pkgdatadir)|g' \
+            -e 's|@pkglocalstatedir@|$(pkglocalstatedir)|g' \
+                $< > $@.new
+        mv $@.new $@
+
+pdf : $(srcdir)/doc/alue.pdf
+
 info : $(srcdir)/doc/alue.info
-        @echo "DEFS=@DEFS@"
 
-pdf : doc/alue.pdf
+install : all info alue.cfg check | print-conf
+        $(PRE_INSTALL)
+        $(NORMAL_INSTALL)
+        if ! test -d $(TESTDIR)$(bindir); then \
+                $(INSTALL_DIR) $(DESTDIR)$(bindir) ; \
+        fi
+        $(INSTALL_PROGRAM) alue $(DESTDIR)$(bindir)/alue
+        if ! test -d $(DESTDIR)$(pkgsysconfdir); then \
+                $(INSTALL_DIR) $(DESTDIR)$(pkgsysconfdir) ; \
+        fi
+        $(INSTALL_DATA) alue.cfg $(DESTDIR)$(cfgfile).dist
+        if ! test -d $(TESTDIR)$(infodir); then \
+                $(INSTALL_DIR) $(DESTDIR)$(infodir) ; \
+        fi
+        $(INSTALL_DATA) alue.info $(DESTDIR)$(infodir)/alue.info
+        $(POST_INSTALL)
+        $(INSTALL_INFO) --dir=$(DESTDIR)$(infodir)/dir \
+          $(DESTDIR)$(infodir)/alue.info
 
 clean :
-        $(RM) *.o */*.o *.d */*.d *.d.* */*.d.* alue run-test
+        $(RM) *.o */*.o *.d */*.d *.d.* */*.d.* alue check
 
-%.o: %.cc
+%.o: $(srcdir)/%.cc | print-conf
         @echo CXX DEFS CXXFLAGS -c -o $@ $<
-        @$(CXX) @DEFS@ $(CXXFLAGS) -c -o $@ $<
+        @$(CXX) $(DEFS) $(CXXFLAGS) -c -o $@ $<
 
-%.d: %.cc
-        @echo "Find the dependencies of $<"
+%.d: $(srcdir)/%.cc | print-conf
+        @echo CXX -MM DEFS CPPFLAGS $<
         @set -e; rm -f $@; \
-                $(CXX) -MM $(CPPFLAGS) $< > $@.$$$$; \
+                $(CXX) -MM $(DEFS) $(CPPFLAGS) $< > $@.$$$$; \
                 sed 's,$(notdir $*)\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
                 rm -f $@.$$$$
 
+%.pdf : $(srcdir)/%.texinfo
+        $(TEXI2PDF) -q -o $@ $<
+
 %.info : $(srcdir)/%.texinfo
         $(MAKEINFO) $<
-%.pdf : %.texinfo
-        texi2pdf -q -o $@ $<
 
 GNUmakefile : config.status GNUmakefile.in

alue_posix.cc

@@ -126 +126 @@
                  "verbatim HTTPS file directory name")
                 ("config-file",
-                 po::value<std::string>()->default_value("alue.cfg"),
+                 po::value<std::string>()->default_value(CONFFILE),
                  "name of the the configuration file")
                 ("db-file",

configure.ac

@@ -18 +18 @@
 AC_PROG_CC
 AC_PROG_CXX
+AC_PROG_INSTALL
 AC_LANG(C++)
 #     checks for libraries