diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-12-05 13:41:28 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-12-05 13:41:28 +0000 |
commit | f00e4ea8bd4bb0ea03ae4c89d776f6758baa7bde (patch) | |
tree | b340d4a2122ee0668b594367063bae90f3ee5ef9 /contrib/Makefile.am | |
parent | 1ec1c4292d3952f17a302c7430016d4ab55fde22 (diff) | |
download | gnunet-f00e4ea8bd4bb0ea03ae4c89d776f6758baa7bde.tar.gz gnunet-f00e4ea8bd4bb0ea03ae4c89d776f6758baa7bde.zip |
-rename and install
Diffstat (limited to 'contrib/Makefile.am')
-rw-r--r-- | contrib/Makefile.am | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am index db9e6d747..7d1bfb8ab 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am | |||
@@ -9,7 +9,7 @@ noinst_PROGRAMS = \ | |||
9 | 9 | ||
10 | if !MINGW | 10 | if !MINGW |
11 | timeout_watchdog_SOURCES = \ | 11 | timeout_watchdog_SOURCES = \ |
12 | timeout_watchdog.c | 12 | timeout_watchdog.c |
13 | else | 13 | else |
14 | timeout_watchdog_SOURCES = \ | 14 | timeout_watchdog_SOURCES = \ |
15 | timeout_watchdog_w32.c | 15 | timeout_watchdog_w32.c |
@@ -25,6 +25,9 @@ bin_SCRIPTS = \ | |||
25 | gnunet-gns-import.sh | 25 | gnunet-gns-import.sh |
26 | 26 | ||
27 | dist_pkgdata_DATA = \ | 27 | dist_pkgdata_DATA = \ |
28 | gns-bcd.html \ | ||
29 | gns-bcd.tex \ | ||
30 | gnunet-logo.pdf \ | ||
28 | gnunet-logo-color.png \ | 31 | gnunet-logo-color.png \ |
29 | testing_hostkeys.ecc | 32 | testing_hostkeys.ecc |
30 | 33 | ||
@@ -56,7 +59,7 @@ EXTRA_DIST = \ | |||
56 | openvpn-tap32/tapw64/OemWin2k.inf \ | 59 | openvpn-tap32/tapw64/OemWin2k.inf \ |
57 | openvpn-tap32/INSTALL \ | 60 | openvpn-tap32/INSTALL \ |
58 | openvpn-tap32/tap32-signed-i386-2.1.zip \ | 61 | openvpn-tap32/tap32-signed-i386-2.1.zip \ |
59 | openvpn-tap32/tap32-source-2.1.zip | 62 | openvpn-tap32/tap32-source-2.1.zip |
60 | 63 | ||
61 | do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g' | 64 | do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g' |
62 | 65 | ||
@@ -70,7 +73,7 @@ do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g' | |||
70 | # gnmessage.sh \ | 73 | # gnmessage.sh \ |
71 | # junkinsert.sh \ | 74 | # junkinsert.sh \ |
72 | # junklookup.sh \ | 75 | # junklookup.sh \ |
73 | # namespacehelper.sh | 76 | # namespacehelper.sh |
74 | 77 | ||
75 | 78 | ||
76 | check_PROGRAMS = \ | 79 | check_PROGRAMS = \ |
@@ -90,12 +93,12 @@ test_gnunet_prefix_LDADD = \ | |||
90 | $(GCLIBADD) $(WINLIB) \ | 93 | $(GCLIBADD) $(WINLIB) \ |
91 | $(LTLIBICONV) \ | 94 | $(LTLIBICONV) \ |
92 | $(GN_LIBINTL) \ | 95 | $(GN_LIBINTL) \ |
93 | $(LIBLTDL) -lunistring $(XLIB) | 96 | $(LIBLTDL) -lunistring $(XLIB) |
94 | 97 | ||
95 | pkghellodir= $(pkgdatadir)/hellos | 98 | pkghellodir= $(pkgdatadir)/hellos |
96 | 99 | ||
97 | install-data-local: | 100 | install-data-local: |
98 | $(mkinstalldirs) $(DESTDIR)$(pkghellodir) | 101 | $(mkinstalldirs) $(DESTDIR)$(pkghellodir) |
99 | @$(NORMAL_INSTALL) | 102 | @$(NORMAL_INSTALL) |
100 | for hello in $(srcdir)/hellos/*; do \ | 103 | for hello in $(srcdir)/hellos/*; do \ |
101 | if test -f $$hello; then \ | 104 | if test -f $$hello; then \ |