diff --git a/Makefile.in b/Makefile.in index f6b9ca1bf..aad3b93c9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -17,9 +17,12 @@ # srcdir = @srcdir@ -devdir = @devdir@ -top_builddir = @top_builddir@ +abs_srcdir = @abs_srcdir@ top_srcdir = @top_srcdir@ +abs_top_srcdir = @abs_top_srcdir@ +top_builddir = @top_builddir@ +abs_top_builddir = @abs_top_builddir@ +devdir = @devdir@ # Installation paths for package building prefix = @prefix@ @@ -197,9 +200,10 @@ siglist.c signame.c: cd lib/util && exec $(MAKE) $@ depend: siglist.c signame.c - $(top_srcdir)/mkdep.pl --builddir=`pwd` --srcdir=$(top_srcdir) \ - lib/util/Makefile.in lib/zlib/Makefile.in lib/iolog/Makefile.in \ - lib/logsrv/Makefile.in logsrvd/Makefile.in \ + $(top_srcdir)/mkdep.pl \ + --srcdir=$(abs_top_srcdir) --builddir=$(abs_top_builddir) \ + lib/util/Makefile.in lib/zlib/Makefile.in \ + lib/iolog/Makefile.in lib/logsrv/Makefile.in logsrvd/Makefile.in \ plugins/group_file/Makefile.in plugins/sample/Makefile.in \ plugins/sudoers/Makefile.in plugins/system_group/Makefile.in \ plugins/python/Makefile.in \ @@ -364,7 +368,7 @@ force-dist: ChangeLog $(srcdir)/MANIFEST ls -l ../$(PACKAGE_TARNAME)-$(VERSION).tar.gz package: $(srcdir)/etc/sudo.pp - DESTDIR=`cd $(top_builddir) && pwd`/destdir; rm -rf $$DESTDIR; \ + DESTDIR=$(abs_top_builddir)/destdir; rm -rf $$DESTDIR; \ $(MAKE) install INSTALL_OWNER= DESTDIR=$$DESTDIR && \ $(SHELL) $(srcdir)/pp $(PPFLAGS) \ --destdir=$$DESTDIR \ diff --git a/doc/Makefile.in b/doc/Makefile.in index a73385bda..6ff79da9d 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -21,9 +21,12 @@ #### Start of system configuration section. #### srcdir = @srcdir@ -docdir = @docdir@ -top_builddir = @top_builddir@ +abs_srcdir = @abs_srcdir@ top_srcdir = @top_srcdir@ +abs_top_srcdir = @abs_top_srcdir@ +top_builddir = @top_builddir@ +abs_top_builddir = @abs_top_builddir@ +docdir = @docdir@ # Tools to use SED = @SED@ diff --git a/examples/Makefile.in b/examples/Makefile.in index 950f7f150..2b518050c 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -21,10 +21,13 @@ #### Start of system configuration section. #### srcdir = @srcdir@ -docdir = @docdir@ -exampledir = @exampledir@ -top_builddir = @top_builddir@ +abs_srcdir = @abs_srcdir@ top_srcdir = @top_srcdir@ +abs_top_srcdir = @abs_top_srcdir@ +top_builddir = @top_builddir@ +abs_top_builddir = @abs_top_builddir@ +exampledir = @exampledir@ +docdir = @docdir@ # Our install program supports extra flags... INSTALL = $(SHELL) $(top_srcdir)/install-sh -c diff --git a/include/Makefile.in b/include/Makefile.in index d5b9758d4..edb0544de 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -21,8 +21,11 @@ #### Start of system configuration section. #### srcdir = @srcdir@ -top_builddir = @top_builddir@ +abs_srcdir = @abs_srcdir@ top_srcdir = @top_srcdir@ +abs_top_srcdir = @abs_top_srcdir@ +top_builddir = @top_builddir@ +abs_top_builddir = @abs_top_builddir@ includedir = @includedir@ cross_compiling = @CROSS_COMPILING@ diff --git a/lib/iolog/Makefile.in b/lib/iolog/Makefile.in index 464511911..0764dda97 100644 --- a/lib/iolog/Makefile.in +++ b/lib/iolog/Makefile.in @@ -21,9 +21,12 @@ #### Start of system configuration section. #### srcdir = @srcdir@ -devdir = @devdir@ -top_builddir = @top_builddir@ +abs_srcdir = @abs_srcdir@ top_srcdir = @top_srcdir@ +abs_top_srcdir = @abs_top_srcdir@ +top_builddir = @top_builddir@ +abs_top_builddir = @abs_top_builddir@ +devdir = @devdir@ incdir = $(top_srcdir)/include cross_compiling = @CROSS_COMPILING@ @@ -100,8 +103,8 @@ pvs-studio: $(POBJS) plog-converter $(PVS_LOG_OPTS) $(POBJS) depend: - $(top_srcdir)/mkdep.pl --srcdir=$(top_srcdir) \ - --builddir=`pwd`/$(top_builddir) lib/iolog/Makefile.in + $(top_srcdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ + --builddir=$(abs_top_builddir) lib/iolog/Makefile.in cd $(top_builddir) && ./config.status --file lib/iolog/Makefile Makefile: $(srcdir)/Makefile.in diff --git a/lib/logsrv/Makefile.in b/lib/logsrv/Makefile.in index 31e04ab4c..c990b978b 100644 --- a/lib/logsrv/Makefile.in +++ b/lib/logsrv/Makefile.in @@ -21,9 +21,12 @@ #### Start of system configuration section. #### srcdir = @srcdir@ -devdir = @devdir@ -top_builddir = @top_builddir@ +abs_srcdir = @abs_srcdir@ top_srcdir = @top_srcdir@ +abs_top_srcdir = @abs_top_srcdir@ +top_builddir = @top_builddir@ +abs_top_builddir = @abs_top_builddir@ +devdir = @devdir@ incdir = $(top_srcdir)/include # Compiler & tools to use @@ -85,8 +88,8 @@ pvs-studio: $(POBJS) plog-converter $(PVS_LOG_OPTS) $(POBJS) depend: - $(top_srcdir)/mkdep.pl --srcdir=$(top_srcdir) \ - --builddir=`pwd`/$(top_builddir) lib/logsrv/Makefile.in + $(top_srcdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ + --builddir=$(abs_top_builddir) lib/logsrv/Makefile.in cd $(top_builddir) && ./config.status --file lib/logsrv/Makefile Makefile: $(srcdir)/Makefile.in diff --git a/lib/util/Makefile.in b/lib/util/Makefile.in index 82aa0f510..96bda97f0 100644 --- a/lib/util/Makefile.in +++ b/lib/util/Makefile.in @@ -21,9 +21,12 @@ #### Start of system configuration section. #### srcdir = @srcdir@ -devdir = @devdir@ -top_builddir = @top_builddir@ +abs_srcdir = @abs_srcdir@ top_srcdir = @top_srcdir@ +abs_top_srcdir = @abs_top_srcdir@ +top_builddir = @top_builddir@ +abs_top_builddir = @abs_top_builddir@ +devdir = @devdir@ incdir = $(top_srcdir)/include cross_compiling = @CROSS_COMPILING@ @@ -171,8 +174,8 @@ pvs-studio: $(POBJS) plog-converter $(PVS_LOG_OPTS) $(POBJS) depend: - $(top_srcdir)/mkdep.pl --srcdir=$(top_srcdir) \ - --builddir=`pwd`/$(top_builddir) lib/util/Makefile.in + $(top_srcdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ + --builddir=$(abs_top_builddir) lib/util/Makefile.in cd $(top_builddir) && ./config.status --file lib/util/Makefile Makefile: $(srcdir)/Makefile.in diff --git a/lib/zlib/Makefile.in b/lib/zlib/Makefile.in index f7868ace6..a44b63ac7 100644 --- a/lib/zlib/Makefile.in +++ b/lib/zlib/Makefile.in @@ -21,8 +21,11 @@ #### Start of system configuration section. #### srcdir = @srcdir@ -top_builddir = @top_builddir@ +abs_srcdir = @abs_srcdir@ top_srcdir = @top_srcdir@ +abs_top_srcdir = @abs_top_srcdir@ +top_builddir = @top_builddir@ +abs_top_builddir = @abs_top_builddir@ cross_compiling = @CROSS_COMPILING@ # Where to install things... @@ -96,8 +99,8 @@ LTOBJS = adler32.lo compress.lo crc32.lo deflate.lo gzclose.lo gzlib.lo \ all: libsudo_z.la depend: - $(top_srcdir)/mkdep.pl --srcdir=$(top_srcdir) \ - --builddir=`pwd`/$(top_builddir) lib/zlib/Makefile.in + $(top_srcdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ + --builddir=$(abs_top_builddir) lib/zlib/Makefile.in cd $(top_builddir) && ./config.status --file lib/zlib/Makefile Makefile: $(srcdir)/Makefile.in diff --git a/logsrvd/Makefile.in b/logsrvd/Makefile.in index c1e9b68ef..a4e7a4b09 100644 --- a/logsrvd/Makefile.in +++ b/logsrvd/Makefile.in @@ -21,9 +21,12 @@ #### Start of system configuration section. #### srcdir = @srcdir@ -devdir = @devdir@ -top_builddir = @top_builddir@ +abs_srcdir = @abs_srcdir@ top_srcdir = @top_srcdir@ +abs_top_srcdir = @abs_top_srcdir@ +top_builddir = @top_builddir@ +abs_top_builddir = @abs_top_builddir@ +devdir = @devdir@ incdir = $(top_srcdir)/include rundir = @rundir@ cross_compiling = @CROSS_COMPILING@ @@ -120,8 +123,8 @@ VERSION = @PACKAGE_VERSION@ all: $(PROGS) depend: - $(top_srcdir)/mkdep.pl --srcdir=$(top_srcdir) \ - --builddir=`pwd`/$(top_builddir) logsrvd/Makefile.in + $(top_srcdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ + --builddir=$(abs_top_builddir) logsrvd/Makefile.in cd $(top_builddir) && ./config.status --file logsrvd/Makefile Makefile: $(srcdir)/Makefile.in diff --git a/plugins/group_file/Makefile.in b/plugins/group_file/Makefile.in index 06728a327..6690acb1e 100644 --- a/plugins/group_file/Makefile.in +++ b/plugins/group_file/Makefile.in @@ -21,9 +21,12 @@ #### Start of system configuration section. #### srcdir = @srcdir@ -devdir = @devdir@ -top_builddir = @top_builddir@ +abs_srcdir = @abs_srcdir@ top_srcdir = @top_srcdir@ +abs_top_srcdir = @abs_top_srcdir@ +top_builddir = @top_builddir@ +abs_top_builddir = @abs_top_builddir@ +devdir = @devdir@ incdir = $(top_srcdir)/include cross_compiling = @CROSS_COMPILING@ @@ -117,8 +120,8 @@ VERSION = @PACKAGE_VERSION@ all: group_file.la depend: - $(top_srcdir)/mkdep.pl --srcdir=$(top_srcdir) \ - --builddir=`pwd`/$(top_builddir) plugins/group_file/Makefile.in + $(top_srcdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ + --builddir=$(abs_top_builddir) plugins/group_file/Makefile.in cd $(top_builddir) && ./config.status --file plugins/group_file/Makefile Makefile: $(srcdir)/Makefile.in diff --git a/plugins/python/Makefile.in b/plugins/python/Makefile.in index 330c28e98..7f48c2d10 100644 --- a/plugins/python/Makefile.in +++ b/plugins/python/Makefile.in @@ -23,10 +23,12 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ srcdir = @srcdir@ -devdir = @devdir@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ abs_srcdir = @abs_srcdir@ +top_builddir = @top_builddir@ +abs_top_builddir = @abs_top_builddir@ +top_srcdir = @top_srcdir@ +abs_top_srcdir = @abs_top_srcdir@ +devdir = @devdir@ incdir = $(top_srcdir)/include cross_compiling = @CROSS_COMPILING@ @@ -131,6 +133,11 @@ CHECK_PYTHON_EXAMPLES_OBJS = check_python_examples.o iohelpers.o testhelpers.o all: python_plugin.la +depend: + $(top_srcdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ + --builddir=$(abs_top_builddir) plugins/python/Makefile.in + cd $(top_builddir) && ./config.status --file plugins/python/Makefile + Makefile: $(srcdir)/Makefile.in cd $(top_builddir) && ./config.status --file plugins/python/Makefile diff --git a/plugins/sample/Makefile.in b/plugins/sample/Makefile.in index 7a52fb479..aa7fe76ac 100644 --- a/plugins/sample/Makefile.in +++ b/plugins/sample/Makefile.in @@ -21,9 +21,12 @@ #### Start of system configuration section. #### srcdir = @srcdir@ -devdir = @devdir@ -top_builddir = @top_builddir@ +abs_srcdir = @abs_srcdir@ top_srcdir = @top_srcdir@ +abs_top_srcdir = @abs_top_srcdir@ +top_builddir = @top_builddir@ +abs_top_builddir = @abs_top_builddir@ +devdir = @devdir@ incdir = $(top_srcdir)/include cross_compiling = @CROSS_COMPILING@ @@ -112,8 +115,8 @@ VERSION = @PACKAGE_VERSION@ all: sample_plugin.la depend: - $(top_srcdir)/mkdep.pl --srcdir=$(top_srcdir) \ - --builddir=`pwd`/$(top_builddir) plugins/sample/Makefile.in + $(top_srcdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ + --builddir=$(abs_top_builddir) plugins/sample/Makefile.in cd $(top_builddir) && ./config.status --file plugins/sample/Makefile Makefile: $(srcdir)/Makefile.in diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in index 20a73122b..5c1947ee2 100644 --- a/plugins/sudoers/Makefile.in +++ b/plugins/sudoers/Makefile.in @@ -26,10 +26,13 @@ #### Start of system configuration section. #### srcdir = @srcdir@ +abs_srcdir = @abs_srcdir@ +top_srcdir = @top_srcdir@ +abs_top_srcdir = @abs_top_srcdir@ +top_builddir = @top_builddir@ +abs_top_builddir = @abs_top_builddir@ devdir = @devdir@ authdir = $(srcdir)/auth -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ incdir = $(top_srcdir)/include docdir = @docdir@ libdir = @libdir@ @@ -258,8 +261,8 @@ $(shlib_opt): $(shlib_exp) @true depend: - $(top_srcdir)/mkdep.pl --srcdir=$(top_srcdir) \ - --builddir=`pwd`/$(top_builddir) plugins/sudoers/Makefile.in + $(top_srcdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ + --builddir=$(abs_top_builddir) plugins/sudoers/Makefile.in cd $(top_builddir) && ./config.status --file plugins/sudoers/Makefile Makefile: $(srcdir)/Makefile.in diff --git a/plugins/system_group/Makefile.in b/plugins/system_group/Makefile.in index 138433b5a..1b88b9924 100644 --- a/plugins/system_group/Makefile.in +++ b/plugins/system_group/Makefile.in @@ -21,9 +21,12 @@ #### Start of system configuration section. #### srcdir = @srcdir@ -devdir = @devdir@ -top_builddir = @top_builddir@ +abs_srcdir = @abs_srcdir@ top_srcdir = @top_srcdir@ +abs_top_srcdir = @abs_top_srcdir@ +top_builddir = @top_builddir@ +abs_top_builddir = @abs_top_builddir@ +devdir = @devdir@ incdir = $(top_srcdir)/include cross_compiling = @CROSS_COMPILING@ @@ -117,8 +120,8 @@ VERSION = @PACKAGE_VERSION@ all: system_group.la depend: - $(top_srcdir)/mkdep.pl --srcdir=$(top_srcdir) \ - --builddir=`pwd`/$(top_builddir) plugins/system_group/Makefile.in + $(top_srcdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ + --builddir=$(abs_top_builddir) plugins/system_group/Makefile.in cd $(top_builddir) && ./config.status --file plugins/system_group/Makefile Makefile: $(srcdir)/Makefile.in diff --git a/src/Makefile.in b/src/Makefile.in index 2adf5dda0..565ea8442 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -21,9 +21,12 @@ #### Start of system configuration section. #### srcdir = @srcdir@ -devdir = @devdir@ -top_builddir = @top_builddir@ +abs_srcdir = @abs_srcdir@ top_srcdir = @top_srcdir@ +abs_top_srcdir = @abs_top_srcdir@ +top_builddir = @top_builddir@ +abs_top_builddir = @abs_top_builddir@ +devdir = @devdir@ incdir = $(top_srcdir)/include rundir = @rundir@ cross_compiling = @CROSS_COMPILING@ @@ -141,8 +144,8 @@ VERSION = @PACKAGE_VERSION@ all: $(PROGS) depend: - $(top_srcdir)/mkdep.pl --srcdir=$(top_srcdir) \ - --builddir=`pwd`/$(top_builddir) src/Makefile.in + $(top_srcdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ + --builddir=$(abs_top_builddir) src/Makefile.in cd $(top_builddir) && ./config.status --file src/Makefile Makefile: $(srcdir)/Makefile.in