diff options
| author | Anders F Björklund <anders.f.bjorklund@gmail.com> | 2018-03-04 12:38:27 +0100 |
|---|---|---|
| committer | Shawn Landden <slandden@gmail.com> | 2018-03-05 17:15:56 -0800 |
| commit | a53a7d5953fa595103d3cc143aa44d48b118eae5 (patch) | |
| tree | b53c5594b4ee15615bf1f96eb01bff077f64cc2e | |
| parent | 817c1622dfea068310d0b88419eb9c04fd13b556 (diff) | |
| download | distcc-git-a53a7d5953fa595103d3cc143aa44d48b118eae5.tar.gz | |
Fix installation of update-distcc-symlinks
| -rw-r--r-- | Makefile.in | 14 | ||||
| -rw-r--r-- | man/distcc.1 | 2 | ||||
| -rw-r--r-- | src/daemon.c | 2 |
3 files changed, 12 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index a1aca1c..4303a58 100644 --- a/Makefile.in +++ b/Makefile.in @@ -98,6 +98,7 @@ dist_files = \ $(example_DOCS) \ $(popt_EXTRA) $(popt_SRC) $(popt_HEADERS) \ $(SRC) $(HEADERS) \ + $(update_distcc_symlinks_PY) \ $(test_SOURCE) \ $(bench_PY) \ $(include_server_PY) \ @@ -183,6 +184,8 @@ include_server_PY = \ include_server_SRC = \ include_server/c_extensions/distcc_pump_c_extensions_module.c +update_distcc_symlinks_PY = update-distcc-symlinks.py + # These are included in the distribution but not installed anywhere. dist_extra = \ README.packaging ChangeLog \ @@ -418,7 +421,7 @@ bin_PROGRAMS = \ @GNOME_BIN@ sbin_PROGRAMS = \ - update-distcc-symlinks.py + update-distcc-symlinks check_PROGRAMS = \ h_argvtostr@EXEEXT@ \ @@ -462,7 +465,7 @@ check_include_server_PY = \ ## NOTE: "all" must be the first (default) rule, aside from patterns. -all: $(bin_PROGRAMS) pump include-server +all: $(bin_PROGRAMS) $(sbin_PROGRAMS) pump include-server # src/config.h.in is used by config.status Makefile: Makefile.in src/config.h.in config.status @@ -510,6 +513,9 @@ distccmon-text@EXEEXT@: $(mon_obj) src/mon-text.o lsdistcc@EXEEXT@: $(lsdistcc_obj) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(lsdistcc_obj) $(LIBS) +update-distcc-symlinks: $(update_distcc_symlinks_PY) + cp $< $@ + h_exten@EXEEXT@: $(h_exten_obj) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(h_exten_obj) $(LIBS) @@ -923,7 +929,7 @@ benchmark: clean: clean-autoconf clean-lzo clean-include-server rm -f src/*.[od] popt/*.[od] rm -f test/*.pyc - rm -f $(check_PROGRAMS) $(bin_PROGRAMS) + rm -f $(check_PROGRAMS) $(bin_PROGRAMS) $(sbin_PROGRAMS) rm -f `echo $(man1_MEN) | sed -e 's/ /.gz /g' -e 's/$$/.gz/'` rm -f $(man_HTML) rm -f distccmon-gnome @@ -1036,7 +1042,7 @@ showpaths: install: showpaths install-doc install-man install-programs \ install-include-server install-example @INSTALL_GNOME@ install-conf -install-programs: $(bin_PROGRAMS) +install-programs: $(bin_PROGRAMS) $(sbin_PROGRAMS) $(mkinstalldirs) "$(DESTDIR)$(bindir)" $(mkinstalldirs) "$(DESTDIR)$(sbindir)" for p in $(bin_PROGRAMS); do \ diff --git a/man/distcc.1 b/man/distcc.1 index eb5bd49..3a5629c 100644 --- a/man/distcc.1 +++ b/man/distcc.1 @@ -373,7 +373,7 @@ DISTCC_HOSTS or a file. distcc will handle the rest. .PP To automatically discover compilers and create masquerade links run the provided -.BR update-distcc-symlinks.py +.BR update-distcc-symlinks script. .PP Note that this masquerade directory must occur on the PATH earlier diff --git a/src/daemon.c b/src/daemon.c index 69b547e..cbec849 100644 --- a/src/daemon.c +++ b/src/daemon.c @@ -157,7 +157,7 @@ static void dcc_warn_masquerade_whitelist(void) { const char *warn = "You must see up masquerade" \ " (see distcc(1)) to list whitelisted compilers or pass" \ " --make-me-a-botnet. To set up masquerade automatically" \ - " run update-distcc-symlinks.py."; + " run update-distcc-symlinks."; d = opendir("/usr/lib/distcc"); if (!d) { |