aboutsummaryrefslogtreecommitdiffstats
path: root/mac/make-package
diff options
context:
space:
mode:
authorSteven Tamm <[email protected]>2002-10-07 20:36:24 +0000
committerSteven Tamm <[email protected]>2002-10-07 20:36:24 +0000
commitbfde2673662f0af592d6de0ed2b3f0809e0fd70c (patch)
tree963cb992ba4cfff356c551eb050fe8a69afb1781 /mac/make-package
parent1168d6c273aed7f60e96838560af4b3922683bb7 (diff)
make-package: Now calls make bootstrap if .elc files are missing
Diffstat (limited to 'mac/make-package')
-rwxr-xr-xmac/make-package16
1 files changed, 14 insertions, 2 deletions
diff --git a/mac/make-package b/mac/make-package
index e4c228ee97..d3eae56a07 100755
--- a/mac/make-package
+++ b/mac/make-package
@@ -62,7 +62,7 @@ do
ac_prev=prefix ;;
-p=* | -prefix=* | --p=* | --prefix=*)
prefix=`expr "x$1" : 'x[^=]*=\(.*\)'` ;;
- -no-configure | -no-conf | --no-configure | --no-conf)
+ -no-configure | -no-conf | --no-configure | --no-conf | --without-config)
with_config=no ;;
-with-x | --with-x)
config_options= ;;
@@ -174,7 +174,19 @@ if test "$with_config" = yes; then
(cd ..; ./configure ${config_options} --prefix=${prefix};)
fi
-(cd ..; make install prefix=${tempparentfull}${prefix})
+## Make bootstrap if .elc files are missing from distribution
+if [ ! -f ../lisp/abbrev.elc ]; then
+ echo "Required .elc files missing; making bootstrap..."
+ if ! (cd ..; make bootstrap prefix=${tempparentfull}${prefix}); then
+ echo "Make bootstrap failed... Aborting make-package."
+ exit 2
+ fi
+fi
+
+if ! (cd ..; make install prefix=${tempparentfull}${prefix}); then
+ echo "Make failed... Aborting make-package."
+ exit 1
+fi
### This trap ensures that the staging directory will be cleaned up even
### when the script is interrupted in mid-career.