Installing in build file sidesteps problems installing as bin

diff --git a/commands/flex-2.5.4/build b/commands/flex-2.5.4/build
index 5fe6513b0d95d44d33ccdf7004703f06bb41ede4..4c9ddef6aa0101541bdb29781197803a622d73f7 100755 (executable)
--- a/commands/flex-2.5.4/build
+++ b/commands/flex-2.5.4/build
@@ -1,18 +1,24 @@
 #!/bin/sh
 
+INSTALL="install -o bin"
 CCACHE=config.cache
 rm -f $CCACHE
 if [ -f Makefile ] 
 then   make distclean
 fi
 L=libfl.a
-INSTALL="/usr/bin/install -o bin" YACC=/usr/bin/yacc RANLIB=true AR=ar CONFIG_SHELL=/bin/bigsh CC=cc /bin/bigsh ./configure --prefix=/usr --libdir=/usr/lib/i386 --includedir=/usr/local/include
-make clean all install
+YACC=/usr/bin/yacc RANLIB=true AR=ar CONFIG_SHELL=/bin/bigsh CC=cc /bin/bigsh ./configure 
+make clean all
+
+$INSTALL -m 755 flex /usr/bin
+$INSTALL -l /usr/bin/flex /usr/bin/flex++
+$INSTALL FlexLexer.h /usr/local/include
+$INSTALL libfl.a /usr/lib/i386
 
 if [ -f /usr/gnu/bin/gcc ]
 then   PATH=/usr/gnu/bin:$PATH
        rm -f $CCACHE
-       INSTALL="/usr/bin/install -o bin" YACC=/usr/bin/yacc CC=gcc CONFIG_SHELL=/bin/bigsh  AR=gar /bin/bigsh ./configure 
+       YACC=/usr/bin/yacc CC=gcc CONFIG_SHELL=/bin/bigsh  AR=gar /bin/bigsh ./configure 
        make clean $L
-       install -o bin -m 644 $L /usr/local/lib/gcc
+       $INSTALL libfl.a /usr/gnu/lib
 fi