isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add abs_top_srcdir and abs_top_builddir and use them.

Browse Source 
Configure provides absolution versions of srcdir, builddir, top_srcdir
and top_builddir.  We can use these instead of calling pwd.
This commit is contained in:
Todd C. Miller
2020-01-20 06:37:42 -07:00
parent 8cacaabe9b
commit 5913c63642
15 changed files with 104 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile.in
View File

@@ -17,9 +17,12 @@
# #
srcdir = @srcdir@ srcdir = @srcdir@
devdir = @devdir@ abs_srcdir = @abs_srcdir@
top_builddir = @top_builddir@
top_srcdir = @top_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 # Installation paths for package building
prefix = @prefix@ prefix = @prefix@
@@ -197,9 +200,10 @@ siglist.c signame.c:
cd lib/util && exec $(MAKE) $@ cd lib/util && exec $(MAKE) $@
depend: siglist.c signame.c depend: siglist.c signame.c
$(top_srcdir)/mkdep.pl --builddir=`pwd` --srcdir=$(top_srcdir) \ $(top_srcdir)/mkdep.pl \
lib/util/Makefile.in lib/zlib/Makefile.in lib/iolog/Makefile.in \ --srcdir=$(abs_top_srcdir) --builddir=$(abs_top_builddir) \
lib/logsrv/Makefile.in logsrvd/Makefile.in \ 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/group_file/Makefile.in plugins/sample/Makefile.in \
plugins/sudoers/Makefile.in plugins/system_group/Makefile.in \ plugins/sudoers/Makefile.in plugins/system_group/Makefile.in \
plugins/python/Makefile.in \ plugins/python/Makefile.in \
@@ -364,7 +368,7 @@ force-dist: ChangeLog $(srcdir)/MANIFEST
ls -l ../$(PACKAGE_TARNAME)-$(VERSION).tar.gz ls -l ../$(PACKAGE_TARNAME)-$(VERSION).tar.gz
package: $(srcdir)/etc/sudo.pp 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 && \ $(MAKE) install INSTALL_OWNER= DESTDIR=$$DESTDIR && \
$(SHELL) $(srcdir)/pp $(PPFLAGS) \ $(SHELL) $(srcdir)/pp $(PPFLAGS) \
--destdir=$$DESTDIR \ --destdir=$$DESTDIR \

7
doc/Makefile.in
View File

@@ -21,9 +21,12 @@
#### Start of system configuration section. #### #### Start of system configuration section. ####
srcdir = @srcdir@ srcdir = @srcdir@
docdir = @docdir@ abs_srcdir = @abs_srcdir@
top_builddir = @top_builddir@
top_srcdir = @top_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 # Tools to use
SED = @SED@ SED = @SED@

9
examples/Makefile.in
View File

@@ -21,10 +21,13 @@
#### Start of system configuration section. #### #### Start of system configuration section. ####
srcdir = @srcdir@ srcdir = @srcdir@
docdir = @docdir@ abs_srcdir = @abs_srcdir@
exampledir = @exampledir@
top_builddir = @top_builddir@
top_srcdir = @top_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... # Our install program supports extra flags...
INSTALL = $(SHELL) $(top_srcdir)/install-sh -c INSTALL = $(SHELL) $(top_srcdir)/install-sh -c

5
include/Makefile.in
View File

@@ -21,8 +21,11 @@
#### Start of system configuration section. #### #### Start of system configuration section. ####
srcdir = @srcdir@ srcdir = @srcdir@
top_builddir = @top_builddir@ abs_srcdir = @abs_srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
abs_top_srcdir = @abs_top_srcdir@
top_builddir = @top_builddir@
abs_top_builddir = @abs_top_builddir@
includedir = @includedir@ includedir = @includedir@
cross_compiling = @CROSS_COMPILING@ cross_compiling = @CROSS_COMPILING@

11
lib/iolog/Makefile.in
View File

@@ -21,9 +21,12 @@
#### Start of system configuration section. #### #### Start of system configuration section. ####
srcdir = @srcdir@ srcdir = @srcdir@
devdir = @devdir@ abs_srcdir = @abs_srcdir@
top_builddir = @top_builddir@
top_srcdir = @top_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 incdir = $(top_srcdir)/include
cross_compiling = @CROSS_COMPILING@ cross_compiling = @CROSS_COMPILING@
@@ -100,8 +103,8 @@ pvs-studio: $(POBJS)
plog-converter $(PVS_LOG_OPTS) $(POBJS) plog-converter $(PVS_LOG_OPTS) $(POBJS)
depend: depend:
$(top_srcdir)/mkdep.pl --srcdir=$(top_srcdir) \ $(top_srcdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \
--builddir=`pwd`/$(top_builddir) lib/iolog/Makefile.in --builddir=$(abs_top_builddir) lib/iolog/Makefile.in
cd $(top_builddir) && ./config.status --file lib/iolog/Makefile cd $(top_builddir) && ./config.status --file lib/iolog/Makefile
Makefile: $(srcdir)/Makefile.in Makefile: $(srcdir)/Makefile.in

11
lib/logsrv/Makefile.in
View File

@@ -21,9 +21,12 @@
#### Start of system configuration section. #### #### Start of system configuration section. ####
srcdir = @srcdir@ srcdir = @srcdir@
devdir = @devdir@ abs_srcdir = @abs_srcdir@
top_builddir = @top_builddir@
top_srcdir = @top_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 incdir = $(top_srcdir)/include
# Compiler & tools to use # Compiler & tools to use
@@ -85,8 +88,8 @@ pvs-studio: $(POBJS)
plog-converter $(PVS_LOG_OPTS) $(POBJS) plog-converter $(PVS_LOG_OPTS) $(POBJS)
depend: depend:
$(top_srcdir)/mkdep.pl --srcdir=$(top_srcdir) \ $(top_srcdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \
--builddir=`pwd`/$(top_builddir) lib/logsrv/Makefile.in --builddir=$(abs_top_builddir) lib/logsrv/Makefile.in
cd $(top_builddir) && ./config.status --file lib/logsrv/Makefile cd $(top_builddir) && ./config.status --file lib/logsrv/Makefile
Makefile: $(srcdir)/Makefile.in Makefile: $(srcdir)/Makefile.in

11
lib/util/Makefile.in
View File

@@ -21,9 +21,12 @@
#### Start of system configuration section. #### #### Start of system configuration section. ####
srcdir = @srcdir@ srcdir = @srcdir@
devdir = @devdir@ abs_srcdir = @abs_srcdir@
top_builddir = @top_builddir@
top_srcdir = @top_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 incdir = $(top_srcdir)/include
cross_compiling = @CROSS_COMPILING@ cross_compiling = @CROSS_COMPILING@
@@ -171,8 +174,8 @@ pvs-studio: $(POBJS)
plog-converter $(PVS_LOG_OPTS) $(POBJS) plog-converter $(PVS_LOG_OPTS) $(POBJS)
depend: depend:
$(top_srcdir)/mkdep.pl --srcdir=$(top_srcdir) \ $(top_srcdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \
--builddir=`pwd`/$(top_builddir) lib/util/Makefile.in --builddir=$(abs_top_builddir) lib/util/Makefile.in
cd $(top_builddir) && ./config.status --file lib/util/Makefile cd $(top_builddir) && ./config.status --file lib/util/Makefile
Makefile: $(srcdir)/Makefile.in Makefile: $(srcdir)/Makefile.in

9
lib/zlib/Makefile.in
View File

@@ -21,8 +21,11 @@
#### Start of system configuration section. #### #### Start of system configuration section. ####
srcdir = @srcdir@ srcdir = @srcdir@
top_builddir = @top_builddir@ abs_srcdir = @abs_srcdir@
top_srcdir = @top_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@ cross_compiling = @CROSS_COMPILING@
# Where to install things... # 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 all: libsudo_z.la
depend: depend:
$(top_srcdir)/mkdep.pl --srcdir=$(top_srcdir) \ $(top_srcdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \
--builddir=`pwd`/$(top_builddir) lib/zlib/Makefile.in --builddir=$(abs_top_builddir) lib/zlib/Makefile.in
cd $(top_builddir) && ./config.status --file lib/zlib/Makefile cd $(top_builddir) && ./config.status --file lib/zlib/Makefile
Makefile: $(srcdir)/Makefile.in Makefile: $(srcdir)/Makefile.in

11
logsrvd/Makefile.in
View File

@@ -21,9 +21,12 @@
#### Start of system configuration section. #### #### Start of system configuration section. ####
srcdir = @srcdir@ srcdir = @srcdir@
devdir = @devdir@ abs_srcdir = @abs_srcdir@
top_builddir = @top_builddir@
top_srcdir = @top_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 incdir = $(top_srcdir)/include
rundir = @rundir@ rundir = @rundir@
cross_compiling = @CROSS_COMPILING@ cross_compiling = @CROSS_COMPILING@
@@ -120,8 +123,8 @@ VERSION = @PACKAGE_VERSION@
all: $(PROGS) all: $(PROGS)
depend: depend:
$(top_srcdir)/mkdep.pl --srcdir=$(top_srcdir) \ $(top_srcdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \
--builddir=`pwd`/$(top_builddir) logsrvd/Makefile.in --builddir=$(abs_top_builddir) logsrvd/Makefile.in
cd $(top_builddir) && ./config.status --file logsrvd/Makefile cd $(top_builddir) && ./config.status --file logsrvd/Makefile
Makefile: $(srcdir)/Makefile.in Makefile: $(srcdir)/Makefile.in

11
plugins/group_file/Makefile.in
View File

@@ -21,9 +21,12 @@
#### Start of system configuration section. #### #### Start of system configuration section. ####
srcdir = @srcdir@ srcdir = @srcdir@
devdir = @devdir@ abs_srcdir = @abs_srcdir@
top_builddir = @top_builddir@
top_srcdir = @top_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 incdir = $(top_srcdir)/include
cross_compiling = @CROSS_COMPILING@ cross_compiling = @CROSS_COMPILING@
@@ -117,8 +120,8 @@ VERSION = @PACKAGE_VERSION@
all: group_file.la all: group_file.la
depend: depend:
$(top_srcdir)/mkdep.pl --srcdir=$(top_srcdir) \ $(top_srcdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \
--builddir=`pwd`/$(top_builddir) plugins/group_file/Makefile.in --builddir=$(abs_top_builddir) plugins/group_file/Makefile.in
cd $(top_builddir) && ./config.status --file plugins/group_file/Makefile cd $(top_builddir) && ./config.status --file plugins/group_file/Makefile
Makefile: $(srcdir)/Makefile.in Makefile: $(srcdir)/Makefile.in

13
plugins/python/Makefile.in
View File

@@ -23,10 +23,12 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
srcdir = @srcdir@ srcdir = @srcdir@
devdir = @devdir@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
abs_srcdir = @abs_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 incdir = $(top_srcdir)/include
cross_compiling = @CROSS_COMPILING@ cross_compiling = @CROSS_COMPILING@
@@ -131,6 +133,11 @@ CHECK_PYTHON_EXAMPLES_OBJS = check_python_examples.o iohelpers.o testhelpers.o
all: python_plugin.la 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 Makefile: $(srcdir)/Makefile.in
cd $(top_builddir) && ./config.status --file plugins/python/Makefile cd $(top_builddir) && ./config.status --file plugins/python/Makefile

11
plugins/sample/Makefile.in
View File

@@ -21,9 +21,12 @@
#### Start of system configuration section. #### #### Start of system configuration section. ####
srcdir = @srcdir@ srcdir = @srcdir@
devdir = @devdir@ abs_srcdir = @abs_srcdir@
top_builddir = @top_builddir@
top_srcdir = @top_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 incdir = $(top_srcdir)/include
cross_compiling = @CROSS_COMPILING@ cross_compiling = @CROSS_COMPILING@
@@ -112,8 +115,8 @@ VERSION = @PACKAGE_VERSION@
all: sample_plugin.la all: sample_plugin.la
depend: depend:
$(top_srcdir)/mkdep.pl --srcdir=$(top_srcdir) \ $(top_srcdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \
--builddir=`pwd`/$(top_builddir) plugins/sample/Makefile.in --builddir=$(abs_top_builddir) plugins/sample/Makefile.in
cd $(top_builddir) && ./config.status --file plugins/sample/Makefile cd $(top_builddir) && ./config.status --file plugins/sample/Makefile
Makefile: $(srcdir)/Makefile.in Makefile: $(srcdir)/Makefile.in

11
plugins/sudoers/Makefile.in
View File

@@ -26,10 +26,13 @@
#### Start of system configuration section. #### #### Start of system configuration section. ####
srcdir = @srcdir@ 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@ devdir = @devdir@
authdir = $(srcdir)/auth authdir = $(srcdir)/auth
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
incdir = $(top_srcdir)/include incdir = $(top_srcdir)/include
docdir = @docdir@ docdir = @docdir@
libdir = @libdir@ libdir = @libdir@
@@ -258,8 +261,8 @@ $(shlib_opt): $(shlib_exp)
@true @true
depend: depend:
$(top_srcdir)/mkdep.pl --srcdir=$(top_srcdir) \ $(top_srcdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \
--builddir=`pwd`/$(top_builddir) plugins/sudoers/Makefile.in --builddir=$(abs_top_builddir) plugins/sudoers/Makefile.in
cd $(top_builddir) && ./config.status --file plugins/sudoers/Makefile cd $(top_builddir) && ./config.status --file plugins/sudoers/Makefile
Makefile: $(srcdir)/Makefile.in Makefile: $(srcdir)/Makefile.in

11
plugins/system_group/Makefile.in
View File

@@ -21,9 +21,12 @@
#### Start of system configuration section. #### #### Start of system configuration section. ####
srcdir = @srcdir@ srcdir = @srcdir@
devdir = @devdir@ abs_srcdir = @abs_srcdir@
top_builddir = @top_builddir@
top_srcdir = @top_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 incdir = $(top_srcdir)/include
cross_compiling = @CROSS_COMPILING@ cross_compiling = @CROSS_COMPILING@
@@ -117,8 +120,8 @@ VERSION = @PACKAGE_VERSION@
all: system_group.la all: system_group.la
depend: depend:
$(top_srcdir)/mkdep.pl --srcdir=$(top_srcdir) \ $(top_srcdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \
--builddir=`pwd`/$(top_builddir) plugins/system_group/Makefile.in --builddir=$(abs_top_builddir) plugins/system_group/Makefile.in
cd $(top_builddir) && ./config.status --file plugins/system_group/Makefile cd $(top_builddir) && ./config.status --file plugins/system_group/Makefile
Makefile: $(srcdir)/Makefile.in Makefile: $(srcdir)/Makefile.in

11
src/Makefile.in
View File

@@ -21,9 +21,12 @@
#### Start of system configuration section. #### #### Start of system configuration section. ####
srcdir = @srcdir@ srcdir = @srcdir@
devdir = @devdir@ abs_srcdir = @abs_srcdir@
top_builddir = @top_builddir@
top_srcdir = @top_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 incdir = $(top_srcdir)/include
rundir = @rundir@ rundir = @rundir@
cross_compiling = @CROSS_COMPILING@ cross_compiling = @CROSS_COMPILING@
@@ -141,8 +144,8 @@ VERSION = @PACKAGE_VERSION@
all: $(PROGS) all: $(PROGS)
depend: depend:
$(top_srcdir)/mkdep.pl --srcdir=$(top_srcdir) \ $(top_srcdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \
--builddir=`pwd`/$(top_builddir) src/Makefile.in --builddir=$(abs_top_builddir) src/Makefile.in
cd $(top_builddir) && ./config.status --file src/Makefile cd $(top_builddir) && ./config.status --file src/Makefile
Makefile: $(srcdir)/Makefile.in Makefile: $(srcdir)/Makefile.in