Merge pull request #335 from sureshsundriyal/freebsd

[freebsd] Fix out of source builds

release/vagrant-static/build.sh

@@ -23,8 +23,6 @@ export PATH=${FAKE_ROOT}/bin:${PATH}
 saved_LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
 export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${FAKE_ROOT}/lib
 ./autogen.sh
-export PATH=${saved_PATH}
-export LD_LIBRARY_PATH=${saved_LD_LIBRARY_PATH}
 
 rm -rf ~/github/lbuild
 mkdir -p ~/github/lbuild
@@ -35,8 +33,8 @@ OS=$(uname -s)
 if test x"${OS}" != x"FreeBSD"; then
     ../lnav/configure \
         LDFLAGS="-L${FAKE_ROOT}/lib" \
-        CC="gcc48" \
-        CXX="g++48" \
+        CC="gcc44" \
+        CXX="g++44" \
         CPPFLAGS="-I${FAKE_ROOT}/include" \
         PATH="${FAKE_ROOT}/bin:${PATH}"
 else
@@ -53,3 +51,6 @@ if test x"${OS}" != x"FreeBSD"; then
     make install-strip DESTDIR=$PWD/instdir
     (cd instdir/ && zip -r /vagrant/lnav-linux.zip .)
 fi
+
+export PATH=${saved_PATH}
+export LD_LIBRARY_PATH=${saved_LD_LIBRARY_PATH}

release/vagrant-static/provision.sh

@@ -12,6 +12,7 @@ cd ~/github
 PACKAGE_URLS="\
     http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz \
     http://ftp.gnu.org/gnu/automake/automake-1.15.tar.gz \
+    https://ftp.gnu.org/gnu/make/make-4.2.1.tar.gz \
     ftp://invisible-island.net/ncurses/ncurses-5.9.tar.gz \
     ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.38.tar.gz \
     ftp://ftp.cwru.edu/pub/bash/readline-6.3.tar.gz \
@@ -47,6 +48,8 @@ done
 
 (cd automake-1.15 && ./configure --prefix=${FAKE_ROOT} && make && make install)
 
+(cd make-4.2.1 && ./configure --prefix=${FAKE_ROOT} && make && make install)
+
 OS=$(uname -s)
 
 

src/Makefile.am

@@ -32,8 +32,8 @@ default-config-json.c: $(srcdir)/default-config.json bin2c
 init-sql.c: bin2c
 	$(BIN2C_V)./bin2c -z -c $(srcdir)/init.sql $@
 
-%.c: %.lnav bin2c
-	$(BIN2C_V)./bin2c -z -c $< $@
+%.c: $(srcdir)/%.lnav bin2c
+	$(BIN2C_V)./bin2c -z -c $(srcdir)/$< $@
 
 TIME_FORMATS = \
     "@%@" \