diff --git a/configure.ac b/configure.ac index aa4c4c7a7..d1e2f4520 100644 --- a/configure.ac +++ b/configure.ac @@ -137,7 +137,7 @@ case "${host}" in if test -d /opt/X11R6 ; then EXTRA_DIR2="/opt/X11R6" fi - EXTRA_DIRS="$EXTRA_DIR1 $EXTRA_DIR2" + EXTRA_DIRS="${EXTRA_DIRS} $EXTRA_DIR1 $EXTRA_DIR2" ;; esac diff --git a/src/Input/Makefile.am b/src/Input/Makefile.am index 63566249d..65e578e84 100644 --- a/src/Input/Makefile.am +++ b/src/Input/Makefile.am @@ -6,10 +6,10 @@ bin_PROGRAMS = js_demo fgjs js_demo_SOURCES = js_demo.cxx -js_demo_LDADD = -lplibjs -lplibul $(audio_LIBS) +js_demo_LDADD = -lplibjs $(audio_LIBS) -lplibul fgjs_SOURCES = fgjs.cxx jsinput.cxx jsinput.h jssuper.cxx jssuper.h -fgjs_LDADD = -lplibjs -lplibul $(audio_LIBS) +fgjs_LDADD = -lplibjs $(audio_LIBS) -lplibul INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src