![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Thu, 10 Jan 2008 08:49:02 +0000 (09:49 +0100) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Thu, 10 Jan 2008 08:49:02 +0000 (09:49 +0100) |
| 1 | 2 | |||
|---|---|---|---|---|
| bindings/Makefile.am | patch | | diff1 | | diff2 | | blob | history |
| src/collectd.conf.pod | patch | | diff1 | | diff2 | | blob | history |
| src/configfile.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc bindings/Makefile.am
index 1c604e191212f2ef160a0680ba09963d6c4e1508,c724725221bfeb1d80a1816aab70dcce6f7d8003..620389fabe7b0ab1424c727835eb802c86bd8e30
+++ b/bindings/Makefile.am
all-local: @PERL_BINDINGS@
install-exec-local:
- [ ! -f perl/Makefile ] || $(MAKE) -C perl install
+ [ ! -f perl/Makefile ] || ( cd perl && $(MAKE) install )
clean-local:
- [ ! -f perl/Makefile ] || $(MAKE) -C perl realclean
+ [ ! -f perl/Makefile ] || ( cd perl && $(MAKE) realclean )
perl: perl/Makefile
- $(MAKE) -C perl
+ cd perl && $(MAKE)
-perl/Makefile: .perl-directory-stamp perl/Makefile.PL perl/Collectd/Makefile.PL
+perl/Makefile: .perl-directory-stamp perl/Makefile.PL \
+ perl/Collectd/Makefile.PL $(top_builddir)/config.status
cd perl && @PERL@ Makefile.PL PREFIX=$(prefix) @PERL_BINDINGS_OPTIONS@
.perl-directory-stamp:
diff --cc src/collectd.conf.pod
Simple merge
diff --cc src/configfile.c
Simple merge