Prechádzať zdrojové kódy

* Misc fixed for make tar
* Added error to ./configure if pack/pack.cfg is missing


svn: 361

Bryan Drewery 22 rokov pred
rodič
commit
bb1eb9dcd0
2 zmenil súbory, kde vykonal 14 pridanie a 4 odobranie
  1. 4 3
      Makefile.in
  2. 10 1
      configure

+ 4 - 3
Makefile.in

@@ -19,7 +19,7 @@ DISTROFILES = config.h.in doc/ misc/ scripts/ ChangeLog Makefile.in build config
 EXCLUDES = pack/salt.h pack/pack.cfg misc/ind doc/DEVEL src/Makefile src/compat/Makefile src/mod/Makefile \
            config.cache config.log config.status config.h lush.h stamp.* misc/.cvsignore src/compat/.cvsignore \
            src/mod/dns.mod/.cvsignore src/mod/.cvsignore src/.cvsignore .cvsignore misc/commit misc/fstrings \
-           misc/plainh misc/grep
+           misc/plainh misc/grep misc/cp.sh src/settings.c src/salt.h
 
 # defaults
 CC = @CC@
@@ -81,8 +81,8 @@ clean:  cleanutils
 	+@cd src && $(MAKE) clean
 	+@cd src/compat && $(MAKE) clean
 	+@cd src/mod && $(MAKE) distclean
-	@rm -f $(HUBEXEC) $(LEAFEXEC) *.stamp core DEBUG *~ key configure.temp .mangled
-	@rm -f $(HUBEXEC).* $(LEAFEXEC).* src/settings.c utctime
+	@rm -f $(HUBEXEC) $(LEAFEXEC) *.stamp core DEBUG *~ src/*~ key configure.temp .mangled
+	@rm -f $(HUBEXEC).* $(LEAFEXEC).* src/settings.c src/salt.h utctime
 
 distclean: clean clean-modconfig
 	@rm -f Makefile src/Makefile src/compat/Makefile src/mod/Makefile
@@ -107,6 +107,7 @@ distrib: clean clean-modconfig
 
 tar: distrib
 	tar -czvf $(DISTRIB).tgz $(DISTRIB)/
+	ls -al $(DISTRIB).tgz
 #	rm -rf $(DISTRIB)/
 #	cd ../ && rm -rf distrib/
 

+ 10 - 1
configure

@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1.1 .
+# From configure.ac Revision: 1.2 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -12366,6 +12366,15 @@ fi
 
 VERSION=`grep "char" $srcdir/src/main.c | $AWK '/egg_version/ {print $4}' | sed -e 's/\"//g' | sed -e 's/\;//g'`
 NUMVER=`grep "int" $srcdir/src/main.c | $AWK '/egg_numver =/ {print $4}' |  sed -e 's/\;//g'`
+if ! test -f $srcdir/pack/pack.cfg; then
+ cat << 'EOF' >&2
+configure: error:
+
+  Your pack cfg is missing, please copy it to $srcdir/pack/pack.cfg
+
+EOF
+ exit 1
+fi
 PACKNAME=`grep "PACKNAME " $srcdir/pack/pack.cfg | $AWK '/PACKNAME/ {print $2}'`
 version_num=`echo $VERSION | $AWK 'BEGIN {FS = "."} {printf("%d%02d%02d", $1, $2, $3)}'`