diff options
| author | Tobias Oetiker <tobi@oetiker.ch> | 2011-10-05 12:09:40 +0200 |
|---|---|---|
| committer | Tobias Oetiker <tobi@oetiker.ch> | 2011-10-05 12:09:40 +0200 |
| commit | 0a83e73c871b94d2c8df4abe18034ab1fd41e202 (patch) | |
| tree | 8711a6b54b381f76b84c370dcb584a718121c0b1 | |
| parent | f1601f6f97589e5011f10ff1b528606903dd8c62 (diff) | |
| download | smokeping-0a83e73c871b94d2c8df4abe18034ab1fd41e202.tar.gz smokeping-0a83e73c871b94d2c8df4abe18034ab1fd41e202.tar.xz | |
no need to mention DESTDIR in normal Makefile.am use ... only in command options. Thanks to Jeff Bilyk for tha patch.
| -rw-r--r-- | doc/Makefile.am | 10 | ||||
| -rw-r--r-- | etc/Makefile.am | 2 | ||||
| -rw-r--r-- | htdocs/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/Makefile.am | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index d09eb8d..315e94e 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -102,20 +102,20 @@ smokeping_examples.pod: ../lib/Smokeping/Examples.pm ../etc/config.dist CLEANFILES = *.[1357] smokeping_examples.pod smokeping_config.pod examples/* -iman1dir = $(DESTDIR)$(mandir)/man1 +iman1dir = $(mandir)/man1 iman1_DATA = $(MAN1) -iman3dir = $(DESTDIR)$(mandir)/man3 +iman3dir = $(mandir)/man3 iman3_DATA = $(MAN3) -iman5dir = $(DESTDIR)$(mandir)/man5 +iman5dir = $(mandir)/man5 iman5_DATA = $(MAN5) -iman7dir = $(DESTDIR)$(mandir)/man7 +iman7dir = $(mandir)/man7 iman7_DATA = $(MAN7) EXAMPLES := $(wildcard examples/config.*) -etcdir = $(DESTDIR)$(sysconfdir)/examples +etcdir = $(sysconfdir)/examples etc_DATA = $(EXAMPLES) diff --git a/etc/Makefile.am b/etc/Makefile.am index c38d88a..70f7edd 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -17,5 +17,5 @@ EXTRA_DIST = basepage.html.dist config.dist smokemail.dist smokeping_secrets.dist tmail.dist -etcdir = $(DESTDIR)$(sysconfdir) +etcdir = $(sysconfdir) etc_DATA = $(EXTRA_DIST) diff --git a/htdocs/Makefile.am b/htdocs/Makefile.am index 7f07b96..1398a1e 100644 --- a/htdocs/Makefile.am +++ b/htdocs/Makefile.am @@ -23,7 +23,7 @@ JS = cropper/smokeping-zoom.js cropper/lib/unittest.js cropper/lib/slider.js cro EXTRA_DIST = $(JS) -jsdir = $(DESTDIR)$(HTDOCSDIR) +jsdir = $(HTDOCSDIR) nobase_js_DATA = $(JS) install-data-local: diff --git a/lib/Makefile.am b/lib/Makefile.am index 666252d..2209134 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -31,5 +31,5 @@ MATCH := $(wildcard Smokeping/matchers/*.pm) EXTRA_DIST = $(PM) $(SP) $(SORT) $(PROBE) $(MATCH) -perllibdir = $(DESTDIR)$(prefix)/lib +perllibdir = $(prefix)/lib nobase_perllib_DATA = $(EXTRA_DIST) |