add spaces before - options.

diff --git a/ChangeLog b/ChangeLog
index 2c10a861a0c6da71836340e41f96dfaf68bad587..2baae7fe572fdbe3f861f1edd9272c2431c5bca1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-04  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * stepmake/aclocal.m4: add spaces before - options.
+       
 2006-01-03  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * lily/relocate.cc (setup_paths): Bugfix: do not store result

diff --git a/configure.in b/configure.in
index 5cb956ec69dc45a3c7495f5371fe0c9a7a2bd1f8..cce8c31358d5326013a5630d9960720498359740 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -125,7 +125,7 @@ if test "$NCSB_DIR" = "unknown"; then
          if test -f `dirname "$d"`/c059033l.afm ; then
              NCSB_DIR=`dirname "$d"`
              break 
-         fi 
+         fi
       done
       if test "$NCSB_DIR" = "unknown";  then
          AC_MSG_WARN(Could not find c059033l.pfb. Use --enable-ncsb-path to set path)

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index aede92655651bc637803a55764eccd8d909f4d09..c5eea55ace0fb70cd2428003fa5b8be700f5e87e 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -191,7 +191,7 @@ AC_DEFUN(STEPMAKE_COMPILE, [
     if test "$optimise_b" = yes; then
        AC_DEFINE(NDEBUG)
        DEFINES="$DEFINES -DNDEBUG"
-       OPTIMIZE="-O2 -finline-functions"
+       OPTIMIZE=" -O2 -finline-functions"
     fi
 
     if test $profile_b = yes; then
@@ -211,7 +211,7 @@ AC_DEFUN(STEPMAKE_COMPILE, [
     # If -pipe requested, test if it works and add to CFLAGS.
     if test "$pipe_b" = yes; then
        save_cflags="$CFLAGS"
-       CFLAGS="-pipe $CFLAGS";
+       CFLAGS=" -pipe $CFLAGS";
        AC_CACHE_CHECK([whether compiler understands -pipe],
            [stepmake_cflags_pipe],
            AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[/* -pipe test */]])],
@@ -232,7 +232,7 @@ AC_DEFUN(STEPMAKE_COMPILE, [
         alpha*-*-*)
            dnl should do compile test?
            AC_MSG_RESULT(-mieee)
-           CFLAGS="-mieee $CFLAGS"
+           CFLAGS=" -mieee $CFLAGS"
            ;;
        *)
            AC_MSG_RESULT([none])

diff --git a/stepmake/bin/package-diff.py b/stepmake/bin/package-diff.py
index 65c91eb84516cbb5734066b166adf7e4817e51df..6837116e0a8aeb522a266384cbd2d102fd69307f 100644 (file)
--- a/stepmake/bin/package-diff.py
+++ b/stepmake/bin/package-diff.py
@@ -18,7 +18,13 @@ import pipes
 _debug = 0
 
 _prune = ['(*)']
+def system (cmd):
+       print cmd
+       s = os.system (cmd)
+       if s:
+               raise 'barf'
 
+       
 def find(pattern, dir = os.curdir):
         list = []
         names = os.listdir(dir)
@@ -91,12 +97,12 @@ def cleanup ():
        global from_diff, to_diff, original_dir
        os.chdir ('/tmp/package-diff')
        sys.stderr.write ('Cleaning ... ')
-       os.system ('rm -fr %s %s' % (from_diff, to_diff))
+       system ('rm -fr %s %s' % (from_diff, to_diff))
        sys.stderr.write ('\n')
        os.chdir (original_dir)
 
 def untar (fn):
-       # os.system ('pwd');
+       # system ('pwd');
        try:
                open (fn)
        except:
@@ -104,7 +110,7 @@ def untar (fn):
                cleanup ()
                sys.exit (1)
        sys.stderr.write ("Untarring: %s\n" % fn)
-       os.system ('gzip --quiet -dc ' + fn + '| tar xf - ')
+       system ('gzip --quiet -dc ' + fn + '| tar xf - ')
        sys.stderr.flush ()
 
 def remove_automatic (dirnames):
@@ -148,13 +154,13 @@ def remove_configure (dir):
        os.chdir (dir)
 
        # ugh
-       os.system ('rm -f *.ly')
+       system ('rm -f *.ly')
 
        # should do 'make distclean ?'
-       os.system ('rm -rf debian/out GNUmakefile config.cache config.h config.hh config.log config.make config.status configure stepmake/GNUmakefile stepmake/config.hh stepmake/config.log stepmake/config.status stepmake/config.make')
+       system ('rm -rf debian/out GNUmakefile config.cache config.h config.hh config.log config.make config.status configure stepmake/GNUmakefile stepmake/config.hh stepmake/config.log stepmake/config.status stepmake/config.make')
 
        # ugh: symlinks
-       os.system ('rm -f stepmake/stepmake/stepmake stepmake/stepmake/bin')
+       system ('rm -f stepmake/stepmake/stepmake stepmake/stepmake/bin')
 
 
 # ugh, how to get rid of .tex files generated by lily?
@@ -201,10 +207,10 @@ def makediff (fromdir, todir, patch_name):
        f.close ()
                        
        sys.stderr.write ('diffing to %s... ' % patch_name)
-       os.system ('pwd')
+       system ('pwd')
        print ('diff -purN %s . >> %s' % (fromdir, patch_name))
-       os.system ('diff -purN %s . >> %s' % (fromdir, patch_name))
-       os.system ('gzip --quiet -9f %s' % patch_name)
+       system ('diff -purN %s . >> %s' % (fromdir, patch_name))
+       system ('gzip --quiet -9f %s' % patch_name)
    
 
 os.environ['GZIP'] = '-q'
@@ -281,7 +287,7 @@ if release:
 import tempfile
 original_dir = os.getcwd ();
 
-os.system ('rm -rf /tmp/package-diff') 
+system ('rm -rf /tmp/package-diff') 
 try:
        os.mkdir ('/tmp/package-diff')
 except:
@@ -320,10 +326,10 @@ if not from_src:
        os.chdir (original_dir)
 else:
        sys.stderr.write ('copying ' + from_src + ' to ' + from_diff + '\n')
-       # os.system ('cp -pr %s %s' % (srcdir, from_diff))
-       os.system ('mkdir -p %s '% (from_diff))
+       # system ('cp -pr %s %s' % (srcdir, from_diff))
+       system ('mkdir -p %s '% (from_diff))
        os.chdir (from_src)
-       os.system ('tar cf - --exclude out --exclude out-www . \
+       system ('tar cf - --exclude out --exclude out-www . \
                | tar -xf - -C %s' % from_diff)
 
 
@@ -333,10 +339,10 @@ if not to_src:
        os.chdir (original_dir)
 else:
        sys.stderr.write ('copying ' + to_src + ' to ' + to_diff + '\n')
-       os.system ('mkdir -p %s '% (to_diff))
-       # os.system ('cp -pr %s %s'  (to_src, to_diff))%
+       system ('mkdir -p %s '% (to_diff))
+       # system ('cp -pr %s %s'  (to_src, to_diff))%
        os.chdir (to_src)
-       os.system ('tar -cf - --exclude out --exclude out-www . \
+       system ('tar -cf - --exclude out --exclude out-www . \
                . | tar -xf - -C %s ' % to_diff)
 
 os.chdir (to_diff)