Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ VPATH = @srcdir@
@SET_MAKE@
prefix = @prefix@
DEST = @DEST@
MKDIR_P = @MKDIR_P@
# GNU Make < 3.82 ignores these != statements, they are for bsd make and gnu make >= 4.0.
# gnu make 3.82 interprets a!= b as setting the variable a!.
# it seems to interpret != otherwise and throws an error.
Expand Down Expand Up @@ -159,7 +160,7 @@ MAKE_DEBMOD_ARGS = $(SMAKE_GENERAL_ARGS) $(SMAKE_BUILD_MODULES_ARGS) \
# Special target types
MAKE_CONFIG = $(MAKE) 'MAKE=$(MAKE)'

MAKE_INSTALL = $(MAKE) 'MAKE=$(MAKE)' 'DEST=$(ABSDEST)'
MAKE_INSTALL = $(MAKE) 'MAKE=$(MAKE)' 'DEST=$(ABSDEST)' 'MKDIR_P=$(MKDIR_P)'

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

Expand Down Expand Up @@ -367,7 +368,7 @@ install-start:
echo "" && \
if test ! -d $(DEST); then \
echo "Creating directory '$(DEST)'."; \
$(top_srcdir)/misc/mkinstalldirs $(DEST) >/dev/null; \
$(MKDIR_P) $(DEST) >/dev/null; \
fi

install-bin: install-start
Expand Down Expand Up @@ -399,7 +400,7 @@ install-modules: install-start
if test ! "x`echo *.$(MOD_EXT)`" = "x*.$(MOD_EXT)"; then \
if test ! -d $(DEST)/modules-$(EGGVERSION); then \
echo "Creating 'modules-$(EGGVERSION)' subdirectory and symlink."; \
$(top_srcdir)/misc/mkinstalldirs $(DEST)/modules-$(EGGVERSION) >/dev/null; \
$(MKDIR_P) $(DEST)/modules-$(EGGVERSION) >/dev/null; \
fi; \
(cd $(DEST) && $(LN_S) modules-$(EGGVERSION) modules); \
echo "Copying new modules."; \
Expand All @@ -417,14 +418,14 @@ install-data: install-start
fi
@if test ! -d $(DEST)/logs; then \
echo "Creating 'logs' subdirectory."; \
$(top_srcdir)/misc/mkinstalldirs $(DEST)/logs >/dev/null; \
$(MKDIR_P) $(DEST)/logs >/dev/null; \
$(INSTALL_DATA) $(srcdir)/logs/CONTENTS $(DEST)/logs/; \
fi

install-text: install-start
@if test ! -d $(DEST)/text; then \
echo "Creating 'text' subdirectory."; \
$(top_srcdir)/misc/mkinstalldirs $(DEST)/text >/dev/null; \
$(MKDIR_P) $(DEST)/text >/dev/null; \
fi && \
if test ! -f $(DEST)/text/motd; then \
$(INSTALL_DATA) $(srcdir)/text/motd $(DEST)/text/; \
Expand All @@ -438,7 +439,7 @@ install-help: install-start
if test ! "x`echo $(srcdir)/help/*.help`" = "x$(srcdir)/help/*.help"; then \
if test ! -d $(DEST)/help; then \
echo "Creating 'help' subdirectory."; \
$(top_srcdir)/misc/mkinstalldirs $(DEST)/help >/dev/null; \
$(MKDIR_P) $(DEST)/help >/dev/null; \
fi; \
for i in $(srcdir)/help/*.help; do \
$(INSTALL_DATA) $$i $(DEST)/help/; \
Expand All @@ -447,7 +448,7 @@ install-help: install-start
if test ! "x`echo $(srcdir)/help/msg/*.help`" = "x$(srcdir)/help/msg/*.help"; then \
if test ! -d $(DEST)/help/msg; then \
echo "Creating 'help/msg' subdirectory."; \
$(top_srcdir)/misc/mkinstalldirs $(DEST)/help/msg >/dev/null; \
$(MKDIR_P) $(DEST)/help/msg >/dev/null; \
fi; \
for i in $(srcdir)/help/msg/*.help; do \
$(INSTALL_DATA) $$i $(DEST)/help/msg/; \
Expand All @@ -456,7 +457,7 @@ install-help: install-start
if test ! "x`echo $(srcdir)/help/set/*.help`" = "x$(srcdir)/help/set/*.help"; then \
if test ! -d $(DEST)/help/set; then \
echo "Creating 'help/set' subdirectory."; \
$(top_srcdir)/misc/mkinstalldirs $(DEST)/help/set >/dev/null; \
$(MKDIR_P) $(DEST)/help/set >/dev/null; \
fi; \
for i in $(srcdir)/help/set/*.help; do \
$(INSTALL_DATA) $$i $(DEST)/help/set/; \
Expand All @@ -469,7 +470,7 @@ install-language: install-start
if test ! "x`echo $(srcdir)/language/*.lang`" = "x$(srcdir)/language/*.lang"; then \
if test ! -d $(DEST)/language; then \
echo "Creating 'language' subdirectory."; \
$(top_srcdir)/misc/mkinstalldirs $(DEST)/language >/dev/null; \
$(MKDIR_P) $(DEST)/language >/dev/null; \
fi; \
for i in $(srcdir)/language/*.lang; do \
$(INSTALL_DATA) $$i $(DEST)/language/; \
Expand All @@ -480,8 +481,8 @@ install-language: install-start
install-filesys: install-start
@if test ! -d $(DEST)/filesys; then \
echo "Creating skeletal filesystem subdirectories."; \
$(top_srcdir)/misc/mkinstalldirs $(DEST)/filesys >/dev/null; \
$(top_srcdir)/misc/mkinstalldirs $(DEST)/filesys/incoming >/dev/null; \
$(MKDIR_P) $(DEST)/filesys >/dev/null; \
$(MKDIR_P) $(DEST)/filesys/incoming >/dev/null; \
fi

install-doc: install-start
Expand Down
62 changes: 61 additions & 1 deletion configure
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#! /bin/sh
# From configure.ac 63ef680.
# From configure.ac alpha.
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.71 for Eggdrop 1.10.1.
#
Expand Down Expand Up @@ -731,6 +731,7 @@ STRIP
HEAD_1
LN_S
RANLIB
MKDIR_P
SET_MAKE
MAKE
INSTALL_DATA
Expand Down Expand Up @@ -4335,6 +4336,58 @@ printf "%s\n" "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi



{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5
printf %s "checking for a race-free mkdir -p... " >&6; }
if test -z "$MKDIR_P"; then
if test ${ac_cv_path_mkdir+y}
then :
printf %s "(cached) " >&6
else $as_nop
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
do
IFS=$as_save_IFS
case $as_dir in #(((
'') as_dir=./ ;;
*/) ;;
*) as_dir=$as_dir/ ;;
esac
for ac_prog in mkdir gmkdir; do
for ac_exec_ext in '' $ac_executable_extensions; do
as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue
case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #(
'mkdir ('*'coreutils) '* | \
'BusyBox '* | \
'mkdir (fileutils) '4.1*)
ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext
break 3;;
esac
done
done
done
IFS=$as_save_IFS

fi

test -d ./--version && rmdir ./--version
if test ${ac_cv_path_mkdir+y}; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
# As a last resort, use the slow shell script. Don't cache a
# value for MKDIR_P within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the value is a relative name.
MKDIR_P="$ac_install_sh -d"
fi
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
printf "%s\n" "$MKDIR_P" >&6; }

# Replace relative path with absolute path
MKDIR_P=$(echo "$MKDIR_P" | sed "s|^./misc|${ac_pwd}/misc|")

if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
Expand Down Expand Up @@ -11367,6 +11420,7 @@ gives unlimited permission to copy, distribute and modify it."
ac_pwd='$ac_pwd'
srcdir='$srcdir'
INSTALL='$INSTALL'
MKDIR_P='$MKDIR_P'
AWK='$AWK'
test -n "\$AWK" || AWK=awk
_ACEOF
Expand Down Expand Up @@ -11963,6 +12017,11 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
*) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
esac
ac_MKDIR_P=$MKDIR_P
case $MKDIR_P in
[\\/$]* | ?:[\\/]* ) ;;
*/*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
esac
_ACEOF

cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
Expand Down Expand Up @@ -12017,6 +12076,7 @@ s&@builddir@&$ac_builddir&;t t
s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
Expand Down
5 changes: 5 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,11 @@ EGG_EXEEXT
AC_PROG_INSTALL
AC_CHECK_PROGS(MAKE, make gmake)
AC_PROG_MAKE_SET

AC_PROG_MKDIR_P
# Replace relative path with absolute path
MKDIR_P=$(echo "$MKDIR_P" | sed "s|^./misc|${ac_pwd}/misc|")

AC_PROG_RANLIB
AC_PROG_LN_S
EGG_PROG_HEAD_1
Expand Down
22 changes: 11 additions & 11 deletions doc/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -43,47 +43,47 @@ clean:
install:
@if test ! -d $(DEST)/doc; then \
echo "Creating 'doc' subdirectory."; \
$(top_srcdir)/misc/mkinstalldirs $(DEST)/doc >/dev/null; \
$(MKDIR_P) $(DEST)/doc >/dev/null; \
fi
@if test ! -d $(DEST)/doc/man1; then \
echo "Creating 'doc/man1' subdirectory."; \
$(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/man1 >/dev/null; \
$(MKDIR_P) $(DEST)/doc/man1 >/dev/null; \
fi
@if test ! -d $(DEST)/doc/html; then \
echo "Creating 'doc/html' subdirectory."; \
$(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/html >/dev/null; \
$(MKDIR_P) $(DEST)/doc/html >/dev/null; \
fi
@if test ! -d $(DEST)/doc/html/about; then \
echo "Creating 'doc/html/about' subdirectory."; \
$(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/html/about >/dev/null; \
$(MKDIR_P) $(DEST)/doc/html/about >/dev/null; \
fi
@if test ! -d $(DEST)/doc/html/install; then \
echo "Creating 'doc/html/install' subdirectory."; \
$(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/html/install >/dev/null; \
$(MKDIR_P) $(DEST)/doc/html/install >/dev/null; \
fi
@if test ! -d $(DEST)/doc/html/modules; then \
echo "Creating 'doc/html/modules' subdirectory."; \
$(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/html/modules >/dev/null; \
$(MKDIR_P) $(DEST)/doc/html/modules >/dev/null; \
fi
@if test ! -d $(DEST)/doc/html/modules/mod; then \
echo "Creating 'doc/html/modules/mod' subdirectory."; \
$(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/html/modules/mod >/dev/null; \
$(MKDIR_P) $(DEST)/doc/html/modules/mod >/dev/null; \
fi
@if test ! -d $(DEST)/doc/html/tutorials; then \
echo "Creating 'doc/html/tutorials' subdirectory."; \
$(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/html/tutorials >/dev/null; \
$(MKDIR_P) $(DEST)/doc/html/tutorials >/dev/null; \
fi
@if test ! -d $(DEST)/doc/html/using; then \
echo "Creating 'doc/html/using' subdirectory."; \
$(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/html/using >/dev/null; \
$(MKDIR_P) $(DEST)/doc/html/using >/dev/null; \
fi
@if test ! -d $(DEST)/doc/html/_static; then \
echo "Creating 'doc/html/_static' subdirectory."; \
$(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/html/_static >/dev/null; \
$(MKDIR_P) $(DEST)/doc/html/_static >/dev/null; \
fi
@if test ! -d $(DEST)/doc/settings; then \
echo "Creating 'doc/settings' subdirectory."; \
$(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/settings >/dev/null; \
$(MKDIR_P) $(DEST)/doc/settings >/dev/null; \
fi
@echo "Copying docs."
@for i in $(DOCS); do \
Expand Down
Loading
Loading