Skip to content

Commit 9469cd2

Browse files
michaelortmannmichaelortmann
authored
Update configure/make
* Update misc/install-sh to upstream autoconf-2.71/build-aux/install-sh * Update mkinstalldirs to AC_PROG_MKDIR_P * Replace relative path with absolute path * abs_top_srcdir -> ac_pwd * misc/runautotools * Resolve conflicts
1 parent e9bd136 commit 9469cd2

File tree

8 files changed

+590
-271
lines changed

8 files changed

+590
-271
lines changed

‎Makefile.in‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ VPATH = @srcdir@
1010
@SET_MAKE@
1111
prefix = @prefix@
1212
DEST = @DEST@
13+
MKDIR_P = @MKDIR_P@
1314
# GNU Make < 3.82 ignores these != statements, they are for bsd make and gnu make >= 4.0.
1415
# gnu make 3.82 interprets a!= b as setting the variable a!.
1516
# it seems to interpret != otherwise and throws an error.
@@ -159,7 +160,7 @@ MAKE_DEBMOD_ARGS = $(SMAKE_GENERAL_ARGS) $(SMAKE_BUILD_MODULES_ARGS) \
159160
# Special target types
160161
MAKE_CONFIG = $(MAKE) 'MAKE=$(MAKE)'
161162

162-
MAKE_INSTALL = $(MAKE) 'MAKE=$(MAKE)' 'DEST=$(ABSDEST)'
163+
MAKE_INSTALL = $(MAKE) 'MAKE=$(MAKE)' 'DEST=$(ABSDEST)' 'MKDIR_P=$(MKDIR_P)'
163164

164165
MAKE_DEPEND = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)'
165166

@@ -367,7 +368,7 @@ install-start:
367368
echo "" && \
368369
if test ! -d $(DEST); then \
369370
echo "Creating directory '$(DEST)'."; \
370-
$(top_srcdir)/misc/mkinstalldirs $(DEST) >/dev/null; \
371+
$(MKDIR_P) $(DEST) >/dev/null; \
371372
fi
372373

373374
install-bin: install-start
@@ -399,7 +400,7 @@ install-modules: install-start
399400
if test ! "x`echo *.$(MOD_EXT)`" = "x*.$(MOD_EXT)"; then \
400401
if test ! -d $(DEST)/modules-$(EGGVERSION); then \
401402
echo "Creating 'modules-$(EGGVERSION)' subdirectory and symlink."; \
402-
$(top_srcdir)/misc/mkinstalldirs $(DEST)/modules-$(EGGVERSION) >/dev/null; \
403+
$(MKDIR_P) $(DEST)/modules-$(EGGVERSION) >/dev/null; \
403404
fi; \
404405
(cd $(DEST) && $(LN_S) modules-$(EGGVERSION) modules); \
405406
echo "Copying new modules."; \
@@ -417,14 +418,14 @@ install-data: install-start
417418
fi
418419
@if test ! -d $(DEST)/logs; then \
419420
echo "Creating 'logs' subdirectory."; \
420-
$(top_srcdir)/misc/mkinstalldirs $(DEST)/logs >/dev/null; \
421+
$(MKDIR_P) $(DEST)/logs >/dev/null; \
421422
$(INSTALL_DATA) $(srcdir)/logs/CONTENTS $(DEST)/logs/; \
422423
fi
423424

424425
install-text: install-start
425426
@if test ! -d $(DEST)/text; then \
426427
echo "Creating 'text' subdirectory."; \
427-
$(top_srcdir)/misc/mkinstalldirs $(DEST)/text >/dev/null; \
428+
$(MKDIR_P) $(DEST)/text >/dev/null; \
428429
fi && \
429430
if test ! -f $(DEST)/text/motd; then \
430431
$(INSTALL_DATA) $(srcdir)/text/motd $(DEST)/text/; \
@@ -438,7 +439,7 @@ install-help: install-start
438439
if test ! "x`echo $(srcdir)/help/*.help`" = "x$(srcdir)/help/*.help"; then \
439440
if test ! -d $(DEST)/help; then \
440441
echo "Creating 'help' subdirectory."; \
441-
$(top_srcdir)/misc/mkinstalldirs $(DEST)/help >/dev/null; \
442+
$(MKDIR_P) $(DEST)/help >/dev/null; \
442443
fi; \
443444
for i in $(srcdir)/help/*.help; do \
444445
$(INSTALL_DATA) $$i $(DEST)/help/; \
@@ -447,7 +448,7 @@ install-help: install-start
447448
if test ! "x`echo $(srcdir)/help/msg/*.help`" = "x$(srcdir)/help/msg/*.help"; then \
448449
if test ! -d $(DEST)/help/msg; then \
449450
echo "Creating 'help/msg' subdirectory."; \
450-
$(top_srcdir)/misc/mkinstalldirs $(DEST)/help/msg >/dev/null; \
451+
$(MKDIR_P) $(DEST)/help/msg >/dev/null; \
451452
fi; \
452453
for i in $(srcdir)/help/msg/*.help; do \
453454
$(INSTALL_DATA) $$i $(DEST)/help/msg/; \
@@ -456,7 +457,7 @@ install-help: install-start
456457
if test ! "x`echo $(srcdir)/help/set/*.help`" = "x$(srcdir)/help/set/*.help"; then \
457458
if test ! -d $(DEST)/help/set; then \
458459
echo "Creating 'help/set' subdirectory."; \
459-
$(top_srcdir)/misc/mkinstalldirs $(DEST)/help/set >/dev/null; \
460+
$(MKDIR_P) $(DEST)/help/set >/dev/null; \
460461
fi; \
461462
for i in $(srcdir)/help/set/*.help; do \
462463
$(INSTALL_DATA) $$i $(DEST)/help/set/; \
@@ -469,7 +470,7 @@ install-language: install-start
469470
if test ! "x`echo $(srcdir)/language/*.lang`" = "x$(srcdir)/language/*.lang"; then \
470471
if test ! -d $(DEST)/language; then \
471472
echo "Creating 'language' subdirectory."; \
472-
$(top_srcdir)/misc/mkinstalldirs $(DEST)/language >/dev/null; \
473+
$(MKDIR_P) $(DEST)/language >/dev/null; \
473474
fi; \
474475
for i in $(srcdir)/language/*.lang; do \
475476
$(INSTALL_DATA) $$i $(DEST)/language/; \
@@ -480,8 +481,8 @@ install-language: install-start
480481
install-filesys: install-start
481482
@if test ! -d $(DEST)/filesys; then \
482483
echo "Creating skeletal filesystem subdirectories."; \
483-
$(top_srcdir)/misc/mkinstalldirs $(DEST)/filesys >/dev/null; \
484-
$(top_srcdir)/misc/mkinstalldirs $(DEST)/filesys/incoming >/dev/null; \
484+
$(MKDIR_P) $(DEST)/filesys >/dev/null; \
485+
$(MKDIR_P) $(DEST)/filesys/incoming >/dev/null; \
485486
fi
486487

487488
install-doc: install-start

‎configure‎

Lines changed: 61 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /bin/sh
2-
# From configure.ac 63ef680.
2+
# From configure.ac alpha.
33
# Guess values for system-dependent variables and create Makefiles.
44
# Generated by GNU Autoconf 2.71 for Eggdrop 1.10.1.
55
#
@@ -731,6 +731,7 @@ STRIP
731731
HEAD_1
732732
LN_S
733733
RANLIB
734+
MKDIR_P
734735
SET_MAKE
735736
MAKE
736737
INSTALL_DATA
@@ -4335,6 +4336,58 @@ printf "%s\n" "no" >&6; }
43354336
SET_MAKE="MAKE=${MAKE-make}"
43364337
fi
43374338

4339+
4340+
4341+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5
4342+
printf %s "checking for a race-free mkdir -p... " >&6; }
4343+
if test -z "$MKDIR_P"; then
4344+
if test ${ac_cv_path_mkdir+y}
4345+
then :
4346+
printf %s "(cached) " >&6
4347+
else $as_nop
4348+
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4349+
for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
4350+
do
4351+
IFS=$as_save_IFS
4352+
case $as_dir in #(((
4353+
'') as_dir=./ ;;
4354+
*/) ;;
4355+
*) as_dir=$as_dir/ ;;
4356+
esac
4357+
for ac_prog in mkdir gmkdir; do
4358+
for ac_exec_ext in '' $ac_executable_extensions; do
4359+
as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue
4360+
case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #(
4361+
'mkdir ('*'coreutils) '* | \
4362+
'BusyBox '* | \
4363+
'mkdir (fileutils) '4.1*)
4364+
ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext
4365+
break 3;;
4366+
esac
4367+
done
4368+
done
4369+
done
4370+
IFS=$as_save_IFS
4371+
4372+
fi
4373+
4374+
test -d ./--version && rmdir ./--version
4375+
if test ${ac_cv_path_mkdir+y}; then
4376+
MKDIR_P="$ac_cv_path_mkdir -p"
4377+
else
4378+
# As a last resort, use the slow shell script. Don't cache a
4379+
# value for MKDIR_P within a source directory, because that will
4380+
# break other packages using the cache if that directory is
4381+
# removed, or if the value is a relative name.
4382+
MKDIR_P="$ac_install_sh -d"
4383+
fi
4384+
fi
4385+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
4386+
printf "%s\n" "$MKDIR_P" >&6; }
4387+
4388+
# Replace relative path with absolute path
4389+
MKDIR_P=$(echo "$MKDIR_P" | sed "s|^./misc|${ac_pwd}/misc|")
4390+
43384391
if test -n "$ac_tool_prefix"; then
43394392
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
43404393
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -11367,6 +11420,7 @@ gives unlimited permission to copy, distribute and modify it."
1136711420
ac_pwd='$ac_pwd'
1136811421
srcdir='$srcdir'
1136911422
INSTALL='$INSTALL'
11423+
MKDIR_P='$MKDIR_P'
1137011424
AWK='$AWK'
1137111425
test -n "\$AWK" || AWK=awk
1137211426
_ACEOF
@@ -11963,6 +12017,11 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
1196312017
[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
1196412018
*) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
1196512019
esac
12020+
ac_MKDIR_P=$MKDIR_P
12021+
case $MKDIR_P in
12022+
[\\/$]* | ?:[\\/]* ) ;;
12023+
*/*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
12024+
esac
1196612025
_ACEOF
1196712026
1196812027
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -12017,6 +12076,7 @@ s&@builddir@&$ac_builddir&;t t
1201712076
s&@abs_builddir@&$ac_abs_builddir&;t t
1201812077
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
1201912078
s&@INSTALL@&$ac_INSTALL&;t t
12079+
s&@MKDIR_P@&$ac_MKDIR_P&;t t
1202012080
$ac_datarootdir_hack
1202112081
"
1202212082
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \

‎configure.ac‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,11 @@ EGG_EXEEXT
6565
AC_PROG_INSTALL
6666
AC_CHECK_PROGS(MAKE, make gmake)
6767
AC_PROG_MAKE_SET
68+
69+
AC_PROG_MKDIR_P
70+
# Replace relative path with absolute path
71+
MKDIR_P=$(echo "$MKDIR_P" | sed "s|^./misc|${ac_pwd}/misc|")
72+
6873
AC_PROG_RANLIB
6974
AC_PROG_LN_S
7075
EGG_PROG_HEAD_1

‎doc/Makefile.in‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,47 +43,47 @@ clean:
4343
install:
4444
@if test ! -d $(DEST)/doc; then \
4545
echo "Creating 'doc' subdirectory."; \
46-
$(top_srcdir)/misc/mkinstalldirs $(DEST)/doc >/dev/null; \
46+
$(MKDIR_P) $(DEST)/doc >/dev/null; \
4747
fi
4848
@if test ! -d $(DEST)/doc/man1; then \
4949
echo "Creating 'doc/man1' subdirectory."; \
50-
$(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/man1 >/dev/null; \
50+
$(MKDIR_P) $(DEST)/doc/man1 >/dev/null; \
5151
fi
5252
@if test ! -d $(DEST)/doc/html; then \
5353
echo "Creating 'doc/html' subdirectory."; \
54-
$(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/html >/dev/null; \
54+
$(MKDIR_P) $(DEST)/doc/html >/dev/null; \
5555
fi
5656
@if test ! -d $(DEST)/doc/html/about; then \
5757
echo "Creating 'doc/html/about' subdirectory."; \
58-
$(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/html/about >/dev/null; \
58+
$(MKDIR_P) $(DEST)/doc/html/about >/dev/null; \
5959
fi
6060
@if test ! -d $(DEST)/doc/html/install; then \
6161
echo "Creating 'doc/html/install' subdirectory."; \
62-
$(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/html/install >/dev/null; \
62+
$(MKDIR_P) $(DEST)/doc/html/install >/dev/null; \
6363
fi
6464
@if test ! -d $(DEST)/doc/html/modules; then \
6565
echo "Creating 'doc/html/modules' subdirectory."; \
66-
$(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/html/modules >/dev/null; \
66+
$(MKDIR_P) $(DEST)/doc/html/modules >/dev/null; \
6767
fi
6868
@if test ! -d $(DEST)/doc/html/modules/mod; then \
6969
echo "Creating 'doc/html/modules/mod' subdirectory."; \
70-
$(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/html/modules/mod >/dev/null; \
70+
$(MKDIR_P) $(DEST)/doc/html/modules/mod >/dev/null; \
7171
fi
7272
@if test ! -d $(DEST)/doc/html/tutorials; then \
7373
echo "Creating 'doc/html/tutorials' subdirectory."; \
74-
$(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/html/tutorials >/dev/null; \
74+
$(MKDIR_P) $(DEST)/doc/html/tutorials >/dev/null; \
7575
fi
7676
@if test ! -d $(DEST)/doc/html/using; then \
7777
echo "Creating 'doc/html/using' subdirectory."; \
78-
$(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/html/using >/dev/null; \
78+
$(MKDIR_P) $(DEST)/doc/html/using >/dev/null; \
7979
fi
8080
@if test ! -d $(DEST)/doc/html/_static; then \
8181
echo "Creating 'doc/html/_static' subdirectory."; \
82-
$(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/html/_static >/dev/null; \
82+
$(MKDIR_P) $(DEST)/doc/html/_static >/dev/null; \
8383
fi
8484
@if test ! -d $(DEST)/doc/settings; then \
8585
echo "Creating 'doc/settings' subdirectory."; \
86-
$(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/settings >/dev/null; \
86+
$(MKDIR_P) $(DEST)/doc/settings >/dev/null; \
8787
fi
8888
@echo "Copying docs."
8989
@for i in $(DOCS); do \

0 commit comments

Comments
 (0)