diff options
| author | Martin Schwenke <martin@meltin.net> | 2013-05-28 14:16:25 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2013-05-28 14:24:16 +1000 |
| commit | 982ea336db94ce6386a43df3de2f76c4b39c6249 (patch) | |
| tree | 64da2cbd8bc66593a6703b99369a983a5dd9f159 | |
| parent | 2d3d5c133e49763ef51eb012cb58c60b76a8b25f (diff) | |
| download | samba-982ea336db94ce6386a43df3de2f76c4b39c6249.tar.gz samba-982ea336db94ce6386a43df3de2f76c4b39c6249.tar.xz samba-982ea336db94ce6386a43df3de2f76c4b39c6249.zip | |
build: Fix install paths for pcp pmda
Signed-off-by: Martin Schwenke <martin@meltin.net>
Pair-programmed-with: Amitay Isaacs <amitay@gmail.com>
(This used to be ctdb commit 11af486754bb04899e3dc544157bf70530e66cd1)
| -rwxr-xr-x | ctdb/Makefile.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ctdb/Makefile.in b/ctdb/Makefile.in index 1bbec6f6cc..6b86bade7a 100755 --- a/ctdb/Makefile.in +++ b/ctdb/Makefile.in @@ -46,7 +46,7 @@ SOCKET_WRAPPER_OBJ = @SOCKET_WRAPPER_OBJS@ PMDA_LIBS = -lpcp -lpcp_pmda PMDA_INSTALL = @CTDB_PMDA_INSTALL@ -PMDA_DEST_DIR = /var/lib/pcp/pmdas +PMDA_DEST_DIR = /var/lib/pcp/pmdas/ctdb CFLAGS=@CPPFLAGS@ -g -I$(srcdir)/include -Iinclude -Ilib -Ilib/util -I$(srcdir) \ $(TALLOC_CFLAGS) $(TEVENT_CFLAGS) $(TDB_CFLAGS) -I@libreplacedir@ \ @@ -389,10 +389,10 @@ install: all manpages $(PMDA_INSTALL) if [ ! -f $(DESTDIR)$(etcdir)/ctdb/gcore_trace.sh ];then ${INSTALLCMD} -m 755 config/gcore_trace.sh $(DESTDIR)$(etcdir)/ctdb; fi install_pmda: - $(INSTALLCMD) -m 755 -d $(PMDA_DEST_DIR) - $(INSTALLCMD) -m 755 pmda/Install pmda/Remove $(PMDA_DEST_DIR) - $(INSTALLCMD) -m 644 pmda/pmns pmda/domain.h pmda/help pmda/README $(PMDA_DEST_DIR) - $(INSTALLCMD) -m 755 bin/pmdactdb $(PMDA_DEST_DIR) + $(INSTALLCMD) -m 755 -d $(DESTDIR)$(PMDA_DEST_DIR) + $(INSTALLCMD) -m 755 utils/pmda/Install utils/pmda/Remove $(DESTDIR)$(PMDA_DEST_DIR) + $(INSTALLCMD) -m 644 utils/pmda/pmns utils/pmda/domain.h utils/pmda/help utils/pmda/README $(DESTDIR)$(PMDA_DEST_DIR) + $(INSTALLCMD) -m 755 bin/pmdactdb $(DESTDIR)$(PMDA_DEST_DIR) # Should use $(datarootdir) but older autoconfs don't do this. :-( install_tests: all |