Changes in Makefile.am [a223b6b:78b9503]

File:

• Makefile.am (modified) (4 diffs)

Makefile.am

@@ -4 +4 @@
 GIT_FLAGS := $(if $(GIT_DESCRIPTION),-DGIT_VERSION=$(GIT_DESCRIPTION:barnowl-%=%))
 
-bin_PROGRAMS = bin/barnowl
+bin_PROGRAMS = barnowl.bin
 if ENABLE_ZCRYPT
 bin_PROGRAMS += zcrypt
@@ -11 +11 @@
 zcrypt_SOURCES = zcrypt.c filterproc.c
 
-check_PROGRAMS = bin/tester
+check_PROGRAMS = tester.bin
 dist_check_DATA = t
 dist_check_SCRIPTS = runtests.sh
 
-noinst_SCRIPTS = barnowl
+bin_SCRIPTS = barnowl
 check_SCRIPTS = tester
 
-barnowl tester: %: barnowl-wrapper.in bin/% Makefile
+barnowl tester: %: barnowl-wrapper.in %.bin Makefile
         sed \
             -e 's,[@]abs_srcdir[@],$(abs_srcdir),g' \
@@ -25 +25 @@
         chmod +x $@
 
-bin_barnowl_SOURCES = $(BASE_SRCS) \
+barnowl_bin_SOURCES = $(BASE_SRCS) \
      owl.h owl_perl.h \
      owl.c
-nodist_bin_barnowl_SOURCES = $(GEN_C) $(GEN_H)
+nodist_barnowl_bin_SOURCES = $(GEN_C) $(GEN_H)
 
 dist_man_MANS = doc/barnowl.1
 dist_doc_DATA = doc/intro.txt doc/advanced.txt
 
-bin_barnowl_LDADD = compat/libcompat.a libfaim/libfaim.a
+barnowl_bin_LDADD = compat/libcompat.a libfaim/libfaim.a
 
-bin_tester_SOURCES = $(BASE_SRCS) \
+tester_bin_SOURCES = $(BASE_SRCS) \
      owl.h owl_perl.h \
      tester.c
-nodist_bin_tester_SOURCES = $(GEN_C) $(GEN_H)
+nodist_tester_bin_SOURCES = $(GEN_C) $(GEN_H)
 
-bin_tester_LDADD = compat/libcompat.a libfaim/libfaim.a
+tester_bin_LDADD = compat/libcompat.a libfaim/libfaim.a
 
 TESTS=runtests.sh
@@ -96 +96 @@
         $(COMPILE) -Wall -Wextra -pedantic -fsyntax-only $(CHK_SOURCES)
 
-CLEANFILES = $(BUILT_SOURCES) $(noinst_SCRIPTS) $(check_SCRIPTS)
+do_transform = $(shell echo '$(1)' | sed '$(transform)')
+install-exec-hook:
+        mv -f $(DESTDIR)$(bindir)/$(call do_transform,barnowl.bin) \
+              $(DESTDIR)$(bindir)/$(call do_transform,barnowl)
+
+uninstall-local:
+        rm -f $(DESTDIR)$(bindir)/$(call do_transform,barnowl)
+
+CLEANFILES = $(BUILT_SOURCES) $(bin_SCRIPTS) $(check_SCRIPTS)
 EXTRA_DIST = \
     autogen.sh \