From 2fe127d1089bd1702f83af5aaca79a3f535b728d Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Thu, 6 Feb 2020 14:30:26 -0700 Subject: [PATCH] Move some scripts from the top level src dir to a scripts dir. --- MANIFEST | 11 ++++++----- Makefile.in | 11 ++++++----- doc/Makefile.in | 3 ++- examples/Makefile.in | 3 ++- include/Makefile.in | 3 ++- lib/iolog/Makefile.in | 3 ++- lib/logsrv/Makefile.in | 3 ++- lib/util/Makefile.in | 5 +++-- lib/zlib/Makefile.in | 3 ++- logsrvd/Makefile.in | 5 +++-- plugins/audit_json/Makefile.in | 5 +++-- plugins/group_file/Makefile.in | 5 +++-- plugins/python/Makefile.in | 5 +++-- plugins/sample/Makefile.in | 5 +++-- plugins/sample_approval/Makefile.in | 5 +++-- plugins/sudoers/Makefile.in | 5 +++-- plugins/system_group/Makefile.in | 5 +++-- .../generate_test_coverage.sh | 0 log2cl.pl => scripts/log2cl.pl | 0 mkdep.pl => scripts/mkdep.pl | 0 mkinstalldirs => scripts/mkinstalldirs | 0 mkpkg => scripts/mkpkg | 9 +++++---- pp => scripts/pp | 0 src/Makefile.in | 11 ++++++----- 24 files changed, 62 insertions(+), 43 deletions(-) rename generate_test_coverage.sh => scripts/generate_test_coverage.sh (100%) rename log2cl.pl => scripts/log2cl.pl (100%) rename mkdep.pl => scripts/mkdep.pl (100%) rename mkinstalldirs => scripts/mkinstalldirs (100%) rename mkpkg => scripts/mkpkg (98%) rename pp => scripts/pp (100%) diff --git a/MANIFEST b/MANIFEST index ae9341251..73a3fedaa 100644 --- a/MANIFEST +++ b/MANIFEST @@ -272,7 +272,6 @@ lib/zlib/zlib.exp lib/zlib/zlib.h lib/zlib/zutil.c lib/zlib/zutil.h -log2cl.pl logsrvd/Makefile.in logsrvd/eventlog.c logsrvd/iolog_writer.c @@ -295,9 +294,6 @@ m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4 m4/sudo.m4 -mkdep.pl -mkinstalldirs -mkpkg pathnames.h.in plugins/audit_json/Makefile.in plugins/audit_json/audit_json.c @@ -853,7 +849,12 @@ po/zh_CN.mo po/zh_CN.po po/zh_TW.mo po/zh_TW.po -pp +scripts/generate_test_coverage.sh +scripts/log2cl.pl +scripts/mkdep.pl +scripts/mkinstalldirs +scripts/mkpkg +scripts/pp src/Makefile.in src/conversation.c src/env_hooks.c diff --git a/Makefile.in b/Makefile.in index c6db5e772..b7c989f51 100644 --- a/Makefile.in +++ b/Makefile.in @@ -23,6 +23,7 @@ abs_top_srcdir = @abs_top_srcdir@ top_builddir = @top_builddir@ abs_top_builddir = @abs_top_builddir@ devdir = @devdir@ +scriptdir = $(top_srcdir)/scripts # Installation paths for package building prefix = @prefix@ @@ -200,7 +201,7 @@ siglist.c signame.c: cd lib/util && exec $(MAKE) $@ depend: siglist.c signame.c - $(top_srcdir)/mkdep.pl \ + $(scriptdir)/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 \ @@ -228,7 +229,7 @@ ChangeLog: rm -f $@.tmp; \ fi; \ elif test -d $(srcdir)/.git && cd $(srcdir); then \ - ./log2cl.pl -b master > $@; \ + $(scriptdir)/log2cl.pl -b master > $@; \ else \ echo "ChangeLog data not available" > $@; \ fi @@ -261,7 +262,7 @@ update-pot: sudo) tmpfiles=; cfiles="src/*.c lib/util/*.c";; \ sudoers) \ echo "gettext \"syntax error\"" > confstr.sh; \ - $(SED) -n 's/^.*--with-passprompt=\(.*\)$$/gettext \"\1\"/p' mkpkg | sort -u >> confstr.sh; \ + $(SED) -n 's/^.*--with-passprompt=\(.*\)$$/gettext \"\1\"/p' $(scriptdir)/mkpkg | sort -u >> confstr.sh; \ $(SED) -n -e 's/^badpass_message="/gettext "/p' \ -e 's/^passprompt="/gettext "/p' \ -e 's/^mailsub="/gettext "/p' configure.ac \ @@ -333,7 +334,7 @@ install-nls: for lang in $$SUDO_LINGUAS; do \ test -s $$podir/$$lang.mo || continue; \ echo $(ECHO_N) " $$lang$(ECHO_C)"; \ - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \ + $(SHELL) $(scriptdir)/mkinstalldirs $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \ if test -n "$(LOCALEDIR_SUFFIX)"; then \ if test ! -d $(DESTDIR)$(localedir)/$$lang$(LOCALEDIR_SUFFIX); then \ ln -s $$lang $(DESTDIR)$(localedir)/$$lang$(LOCALEDIR_SUFFIX); \ @@ -370,7 +371,7 @@ force-dist: ChangeLog $(srcdir)/MANIFEST package: $(srcdir)/etc/sudo.pp DESTDIR=$(abs_top_builddir)/destdir; rm -rf $$DESTDIR; \ $(MAKE) install INSTALL_OWNER= DESTDIR=$$DESTDIR && \ - $(SHELL) $(srcdir)/pp $(PPFLAGS) \ + $(SHELL) $(scriptdir)/pp $(PPFLAGS) \ --destdir=$$DESTDIR \ $(srcdir)/etc/sudo.pp \ prefix=$(prefix) \ diff --git a/doc/Makefile.in b/doc/Makefile.in index 6ff79da9d..8c32b32d1 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -27,6 +27,7 @@ abs_top_srcdir = @abs_top_srcdir@ top_builddir = @top_builddir@ abs_top_builddir = @abs_top_builddir@ docdir = @docdir@ +scriptdir = $(top_srcdir)/scripts # Tools to use SED = @SED@ @@ -341,7 +342,7 @@ pre-install: install: install-doc install-dirs: - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir) \ + $(SHELL) $(scriptdir)/mkinstalldirs $(DESTDIR)$(docdir) \ $(DESTDIR)$(mandirexe) $(DESTDIR)$(mandirform) $(DESTDIR)$(mandirsu) install-binaries: diff --git a/examples/Makefile.in b/examples/Makefile.in index f0ca27703..518dbc4f0 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -28,6 +28,7 @@ top_builddir = @top_builddir@ abs_top_builddir = @abs_top_builddir@ exampledir = @exampledir@ docdir = @docdir@ +scriptdir = $(top_srcdir)/scripts # Our install program supports extra flags... INSTALL = $(SHELL) $(top_srcdir)/install-sh -c @@ -72,7 +73,7 @@ pre-install: install: install-doc install-dirs: - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(exampledir) + $(SHELL) $(scriptdir)/mkinstalldirs $(DESTDIR)$(exampledir) install-binaries: diff --git a/include/Makefile.in b/include/Makefile.in index edb0544de..7739e39ef 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -27,6 +27,7 @@ abs_top_srcdir = @abs_top_srcdir@ top_builddir = @top_builddir@ abs_top_builddir = @abs_top_builddir@ includedir = @includedir@ +scriptdir = $(top_srcdir)/scripts cross_compiling = @CROSS_COMPILING@ # Our install program supports extra flags... @@ -65,7 +66,7 @@ pre-install: install: install-includes install-dirs: - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(includedir) + $(SHELL) $(scriptdir)/mkinstalldirs $(DESTDIR)$(includedir) install-binaries: diff --git a/lib/iolog/Makefile.in b/lib/iolog/Makefile.in index 0764dda97..c67d82659 100644 --- a/lib/iolog/Makefile.in +++ b/lib/iolog/Makefile.in @@ -28,6 +28,7 @@ top_builddir = @top_builddir@ abs_top_builddir = @abs_top_builddir@ devdir = @devdir@ incdir = $(top_srcdir)/include +scriptdir = $(top_srcdir)/scripts cross_compiling = @CROSS_COMPILING@ # Compiler & tools to use @@ -103,7 +104,7 @@ pvs-studio: $(POBJS) plog-converter $(PVS_LOG_OPTS) $(POBJS) depend: - $(top_srcdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ + $(scriptdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ --builddir=$(abs_top_builddir) lib/iolog/Makefile.in cd $(top_builddir) && ./config.status --file lib/iolog/Makefile diff --git a/lib/logsrv/Makefile.in b/lib/logsrv/Makefile.in index c990b978b..7b863547b 100644 --- a/lib/logsrv/Makefile.in +++ b/lib/logsrv/Makefile.in @@ -27,6 +27,7 @@ abs_top_srcdir = @abs_top_srcdir@ top_builddir = @top_builddir@ abs_top_builddir = @abs_top_builddir@ devdir = @devdir@ +scriptdir = $(top_srcdir)/scripts incdir = $(top_srcdir)/include # Compiler & tools to use @@ -88,7 +89,7 @@ pvs-studio: $(POBJS) plog-converter $(PVS_LOG_OPTS) $(POBJS) depend: - $(top_srcdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ + $(scriptdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ --builddir=$(abs_top_builddir) lib/logsrv/Makefile.in cd $(top_builddir) && ./config.status --file lib/logsrv/Makefile diff --git a/lib/util/Makefile.in b/lib/util/Makefile.in index b8a15497b..a5b011ec8 100644 --- a/lib/util/Makefile.in +++ b/lib/util/Makefile.in @@ -27,6 +27,7 @@ abs_top_srcdir = @abs_top_srcdir@ top_builddir = @top_builddir@ abs_top_builddir = @abs_top_builddir@ devdir = @devdir@ +scriptdir = $(top_srcdir)/scripts incdir = $(top_srcdir)/include cross_compiling = @CROSS_COMPILING@ @@ -174,7 +175,7 @@ pvs-studio: $(POBJS) plog-converter $(PVS_LOG_OPTS) $(POBJS) depend: siglist.c signame.c - $(top_srcdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ + $(scriptdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ --builddir=$(abs_top_builddir) lib/util/Makefile.in cd $(top_builddir) && ./config.status --file lib/util/Makefile @@ -293,7 +294,7 @@ install: install-dirs esac install-dirs: - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir)/sudo + $(SHELL) $(scriptdir)/mkinstalldirs $(DESTDIR)$(libexecdir)/sudo install-binaries: diff --git a/lib/zlib/Makefile.in b/lib/zlib/Makefile.in index a44b63ac7..558ba947c 100644 --- a/lib/zlib/Makefile.in +++ b/lib/zlib/Makefile.in @@ -26,6 +26,7 @@ top_srcdir = @top_srcdir@ abs_top_srcdir = @abs_top_srcdir@ top_builddir = @top_builddir@ abs_top_builddir = @abs_top_builddir@ +scriptdir = $(top_srcdir)/scripts cross_compiling = @CROSS_COMPILING@ # Where to install things... @@ -99,7 +100,7 @@ LTOBJS = adler32.lo compress.lo crc32.lo deflate.lo gzclose.lo gzlib.lo \ all: libsudo_z.la depend: - $(top_srcdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ + $(scriptdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ --builddir=$(abs_top_builddir) lib/zlib/Makefile.in cd $(top_builddir) && ./config.status --file lib/zlib/Makefile diff --git a/logsrvd/Makefile.in b/logsrvd/Makefile.in index a4e7a4b09..6fa700a68 100644 --- a/logsrvd/Makefile.in +++ b/logsrvd/Makefile.in @@ -27,6 +27,7 @@ abs_top_srcdir = @abs_top_srcdir@ top_builddir = @top_builddir@ abs_top_builddir = @abs_top_builddir@ devdir = @devdir@ +scriptdir = $(top_srcdir)/scripts incdir = $(top_srcdir)/include rundir = @rundir@ cross_compiling = @CROSS_COMPILING@ @@ -123,7 +124,7 @@ VERSION = @PACKAGE_VERSION@ all: $(PROGS) depend: - $(top_srcdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ + $(scriptdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ --builddir=$(abs_top_builddir) logsrvd/Makefile.in cd $(top_builddir) && ./config.status --file logsrvd/Makefile @@ -155,7 +156,7 @@ pre-install: install: install-binaries install-dirs: - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sbindir) + $(SHELL) $(scriptdir)/mkinstalldirs $(DESTDIR)$(sbindir) install-binaries: install-dirs $(PROGS) INSTALL_BACKUP='$(INSTALL_BACKUP)' $(LIBTOOL) $(LTFLAGS) --mode=install $(INSTALL) $(INSTALL_OWNER) -m 0755 sudo_logsrvd $(DESTDIR)$(sbindir)/sudo_logsrvd diff --git a/plugins/audit_json/Makefile.in b/plugins/audit_json/Makefile.in index 51accf889..bd98cba5e 100644 --- a/plugins/audit_json/Makefile.in +++ b/plugins/audit_json/Makefile.in @@ -24,6 +24,7 @@ srcdir = @srcdir@ devdir = @devdir@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +scriptdir = $(top_srcdir)/scripts incdir = $(top_srcdir)/include cross_compiling = @CROSS_COMPILING@ @@ -117,7 +118,7 @@ VERSION = @PACKAGE_VERSION@ all: audit_json.la depend: - $(top_srcdir)/mkdep.pl --srcdir=$(top_srcdir) \ + $(scriptdir)/mkdep.pl --srcdir=$(top_srcdir) \ --builddir=`pwd`/$(top_builddir) plugins/audit_json/Makefile.in cd $(top_builddir) && ./config.status --file plugins/audit_json/Makefile @@ -149,7 +150,7 @@ pre-install: install: install-plugin install-dirs: - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(plugindir) + $(SHELL) $(scriptdir)/mkinstalldirs $(DESTDIR)$(plugindir) install-binaries: diff --git a/plugins/group_file/Makefile.in b/plugins/group_file/Makefile.in index 6690acb1e..f52823307 100644 --- a/plugins/group_file/Makefile.in +++ b/plugins/group_file/Makefile.in @@ -27,6 +27,7 @@ abs_top_srcdir = @abs_top_srcdir@ top_builddir = @top_builddir@ abs_top_builddir = @abs_top_builddir@ devdir = @devdir@ +scriptdir = $(top_srcdir)/scripts incdir = $(top_srcdir)/include cross_compiling = @CROSS_COMPILING@ @@ -120,7 +121,7 @@ VERSION = @PACKAGE_VERSION@ all: group_file.la depend: - $(top_srcdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ + $(scriptdir)/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 @@ -152,7 +153,7 @@ pre-install: install: install-plugin install-dirs: - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(plugindir) + $(SHELL) $(scriptdir)/mkinstalldirs $(DESTDIR)$(plugindir) install-binaries: diff --git a/plugins/python/Makefile.in b/plugins/python/Makefile.in index 590762ad8..900f1ef5b 100644 --- a/plugins/python/Makefile.in +++ b/plugins/python/Makefile.in @@ -29,6 +29,7 @@ abs_top_builddir = @abs_top_builddir@ top_srcdir = @top_srcdir@ abs_top_srcdir = @abs_top_srcdir@ devdir = @devdir@ +scriptdir = $(top_srcdir)/scripts incdir = $(top_srcdir)/include cross_compiling = @CROSS_COMPILING@ @@ -134,7 +135,7 @@ 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) \ + $(scriptdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ --builddir=$(abs_top_builddir) plugins/python/Makefile.in cd $(top_builddir) && ./config.status --file plugins/python/Makefile @@ -169,7 +170,7 @@ pre-install: install: install-plugin install-doc install-dirs: - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(plugindir) $(DESTDIR)$(exampledir) + $(SHELL) $(scriptdir)/mkinstalldirs $(DESTDIR)$(plugindir) $(DESTDIR)$(exampledir) install-binaries: diff --git a/plugins/sample/Makefile.in b/plugins/sample/Makefile.in index aa7fe76ac..25a51ddb2 100644 --- a/plugins/sample/Makefile.in +++ b/plugins/sample/Makefile.in @@ -27,6 +27,7 @@ abs_top_srcdir = @abs_top_srcdir@ top_builddir = @top_builddir@ abs_top_builddir = @abs_top_builddir@ devdir = @devdir@ +scriptdir = $(top_srcdir)/scripts incdir = $(top_srcdir)/include cross_compiling = @CROSS_COMPILING@ @@ -115,7 +116,7 @@ VERSION = @PACKAGE_VERSION@ all: sample_plugin.la depend: - $(top_srcdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ + $(scriptdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ --builddir=$(abs_top_builddir) plugins/sample/Makefile.in cd $(top_builddir) && ./config.status --file plugins/sample/Makefile @@ -147,7 +148,7 @@ pre-install: install: install-plugin install-dirs: - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(plugindir) + $(SHELL) $(scriptdir)/mkinstalldirs $(DESTDIR)$(plugindir) install-binaries: diff --git a/plugins/sample_approval/Makefile.in b/plugins/sample_approval/Makefile.in index f156c19c2..86894a625 100644 --- a/plugins/sample_approval/Makefile.in +++ b/plugins/sample_approval/Makefile.in @@ -24,6 +24,7 @@ srcdir = @srcdir@ devdir = @devdir@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +scriptdir = $(top_srcdir)/scripts incdir = $(top_srcdir)/include cross_compiling = @CROSS_COMPILING@ @@ -117,7 +118,7 @@ VERSION = @PACKAGE_VERSION@ all: sample_approval.la depend: - $(top_srcdir)/mkdep.pl --srcdir=$(top_srcdir) \ + $(scriptdir)/mkdep.pl --srcdir=$(top_srcdir) \ --builddir=`pwd`/$(top_builddir) plugins/sample_approval/Makefile.in cd $(top_builddir) && ./config.status --file plugins/sample_approval/Makefile @@ -149,7 +150,7 @@ pre-install: install: install-plugin install-dirs: - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(plugindir) + $(SHELL) $(scriptdir)/mkinstalldirs $(DESTDIR)$(plugindir) install-binaries: diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in index 5c1947ee2..7a0693817 100644 --- a/plugins/sudoers/Makefile.in +++ b/plugins/sudoers/Makefile.in @@ -32,6 +32,7 @@ abs_top_srcdir = @abs_top_srcdir@ top_builddir = @top_builddir@ abs_top_builddir = @abs_top_builddir@ devdir = @devdir@ +scriptdir = $(top_srcdir)/scripts authdir = $(srcdir)/auth incdir = $(top_srcdir)/include docdir = @docdir@ @@ -261,7 +262,7 @@ $(shlib_opt): $(shlib_exp) @true depend: - $(top_srcdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ + $(scriptdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ --builddir=$(abs_top_builddir) plugins/sudoers/Makefile.in cd $(top_builddir) && ./config.status --file plugins/sudoers/Makefile @@ -392,7 +393,7 @@ pre-install: install: install-plugin install-binaries install-sudoers install-doc install-dirs: - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(plugindir) \ + $(SHELL) $(scriptdir)/mkinstalldirs $(DESTDIR)$(plugindir) \ $(DESTDIR)$(sbindir) $(DESTDIR)$(bindir) \ $(DESTDIR)$(sudoersdir) $(DESTDIR)$(docdir) \ `echo $(DESTDIR)$(rundir)|$(SED) 's,/[^/]*$$,,'` \ diff --git a/plugins/system_group/Makefile.in b/plugins/system_group/Makefile.in index 1b88b9924..f52518970 100644 --- a/plugins/system_group/Makefile.in +++ b/plugins/system_group/Makefile.in @@ -27,6 +27,7 @@ abs_top_srcdir = @abs_top_srcdir@ top_builddir = @top_builddir@ abs_top_builddir = @abs_top_builddir@ devdir = @devdir@ +scriptdir = $(top_srcdir)/scripts incdir = $(top_srcdir)/include cross_compiling = @CROSS_COMPILING@ @@ -120,7 +121,7 @@ VERSION = @PACKAGE_VERSION@ all: system_group.la depend: - $(top_srcdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ + $(scriptdir)/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 @@ -152,7 +153,7 @@ pre-install: install: install-plugin install-dirs: - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(plugindir) + $(SHELL) $(scriptdir)/mkinstalldirs $(DESTDIR)$(plugindir) install-binaries: diff --git a/generate_test_coverage.sh b/scripts/generate_test_coverage.sh similarity index 100% rename from generate_test_coverage.sh rename to scripts/generate_test_coverage.sh diff --git a/log2cl.pl b/scripts/log2cl.pl similarity index 100% rename from log2cl.pl rename to scripts/log2cl.pl diff --git a/mkdep.pl b/scripts/mkdep.pl similarity index 100% rename from mkdep.pl rename to scripts/mkdep.pl diff --git a/mkinstalldirs b/scripts/mkinstalldirs similarity index 100% rename from mkinstalldirs rename to scripts/mkinstalldirs diff --git a/mkpkg b/scripts/mkpkg similarity index 98% rename from mkpkg rename to scripts/mkpkg index 954435aa2..3bb9c8a46 100755 --- a/mkpkg +++ b/scripts/mkpkg @@ -88,9 +88,10 @@ while test $# -gt 0; do shift done -top_srcdir=`dirname $0` +scriptdir=`dirname $0` +configure="${scriptdir}/../configure" -: ${osversion="`$top_srcdir/pp --probe`"} +: ${osversion="`$scriptdir/pp --probe`"} test -n "$osversion" || exit 1 osrelease=`echo "$osversion" | sed -e 's/^[^0-9]*//' -e 's/-.*$//'` : ${MAKE=make} @@ -317,7 +318,7 @@ case "$osversion" in ARCH_FLAGS="-arch i386 -arch x86_64" ;; esac - if test "${osversion}" != "`$top_srcdir/pp --probe`"; then + if test "${osversion}" != "`$scriptdir/pp --probe`"; then sdkvers=`echo "${osversion}" | sed 's/^macos\([0-9][0-9]\)\([0-9]*\)-.*$/\1.\2/'` # SDKs may be under Xcode.app or CommandLineTools (for non-Xcode) if [ -d "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs" ]; then @@ -413,6 +414,6 @@ IFS="$OIFS" if [ -r Makefile ]; then ${MAKE} $make_opts distclean fi -$top_srcdir/configure "$@" || exit 1 +${configure} "$@" || exit 1 ${MAKE} $make_opts && ${MAKE} $make_opts PPFLAGS="$PPFLAGS" PPVARS="$PPVARS" package test $debug -eq 0 && rm -rf destdir diff --git a/pp b/scripts/pp similarity index 100% rename from pp rename to scripts/pp diff --git a/src/Makefile.in b/src/Makefile.in index 565ea8442..349156de5 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -27,6 +27,7 @@ abs_top_srcdir = @abs_top_srcdir@ top_builddir = @top_builddir@ abs_top_builddir = @abs_top_builddir@ devdir = @devdir@ +scriptdir = $(top_srcdir)/scripts incdir = $(top_srcdir)/include rundir = @rundir@ cross_compiling = @CROSS_COMPILING@ @@ -144,7 +145,7 @@ VERSION = @PACKAGE_VERSION@ all: $(PROGS) depend: - $(top_srcdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ + $(scriptdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ --builddir=$(abs_top_builddir) src/Makefile.in cd $(top_builddir) && ./config.status --file src/Makefile @@ -196,16 +197,16 @@ install: install-binaries install-rc @INSTALL_NOEXEC@ install-dirs: # We only create the rc.d dir when installing to the actual system dir - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir) \ + $(SHELL) $(scriptdir)/mkinstalldirs $(DESTDIR)$(bindir) \ $(DESTDIR)$(libexecdir)/sudo $(DESTDIR)$(noexecdir) if test -n "$(INIT_SCRIPT)"; then \ - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(INIT_DIR); \ + $(SHELL) $(scriptdir)/mkinstalldirs $(DESTDIR)$(INIT_DIR); \ if test -z "$(DESTDIR)"; then \ - $(SHELL) $(top_srcdir)/mkinstalldirs \ + $(SHELL) $(scriptdir)/mkinstalldirs \ `echo $(RC_LINK) | $(SED) 's,/[^/]*$$,,'`; \ fi; \ elif test -n "$(tmpfiles_d)"; then \ - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(tmpfiles_d); \ + $(SHELL) $(scriptdir)/mkinstalldirs $(DESTDIR)$(tmpfiles_d); \ fi install-rc: install-dirs