qf/quake2forge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quake2forge synced 2025-06-01 17:22:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed for real this time configure's ability to set a

Browse source 
correct PKGLIBDIR and PKGDATADIR when no --prefix is set
  on the configure line.
This commit is contained in:
Jamie Wilkinson 2002-07-17 05:10:09 +00:00
parent 74c84cbe1f
commit 4a3753eaf5
1 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
configure.in
View file

@ -221,9 +221,6 @@ fi
#AC_CHECK_LIB([Xxf86dga], [main]) #AC_CHECK_LIB([Xxf86dga], [main])
# FIXME: Replace `main' with a function in `-lXxf86vm': # FIXME: Replace `main' with a function in `-lXxf86vm':
#AC_CHECK_LIB([Xxf86vm], [main]) #AC_CHECK_LIB([Xxf86vm], [main])
#AC_CHECK_LIB([ossaudio], [main])
# FIXME: Replace `main' with a function in `-lpthread':
#AC_CHECK_LIB([pthread], [main])
dnl ----------------------- dnl -----------------------
dnl Checks for header files dnl Checks for header files
@ -354,15 +351,13 @@ dnl Fill in path variables
dnl ---------------------- dnl ----------------------
dnl $libdir usually gets set to ${exec_prefix}/lib, dnl $libdir usually gets set to ${exec_prefix}/lib,
dnl $exec_prefix is likely to be "NONE" dnl $prefix and $exec_prefix is likely to be "NONE"
dnl Autoconf usually sets pkglibdir correctly in the Makefile, but not in dnl Autoconf usually sets pkglibdir correctly in the Makefile, but not in
dnl the configure script :( dnl the configure script :(
eval tmp_libdir="$libdir" test "$prefix" = NONE && prefix=/usr/local
if test "x$tmp_libdir" != "xNONE/lib"; then test "$exec_prefix" = NONE && exec_prefix=/usr/local
eval PKGLIBDIR="$libdir/$PACKAGE"
else eval PKGLIBDIR="$libdir/$PACKAGE"
eval PKGLIBDIR="$prefix/lib/$PACKAGE"
fi
AC_DEFINE_UNQUOTED(PKGLIBDIR, "$PKGLIBDIR", [Define this to the path containing the dynamic modules (\${exec-prefix}/lib/quake2/)]) AC_DEFINE_UNQUOTED(PKGLIBDIR, "$PKGLIBDIR", [Define this to the path containing the dynamic modules (\${exec-prefix}/lib/quake2/)])
eval PKGDATADIR="$datadir/$PACKAGE" eval PKGDATADIR="$datadir/$PACKAGE"