--- gigedit/trunk/configure.ac 2007/10/15 20:02:33 1441 +++ gigedit/trunk/configure.ac 2008/01/19 20:07:39 1645 @@ -7,7 +7,7 @@ GIGEDIT_VER_MAJOR=0 GIGEDIT_VER_MINOR=1 -GIGEDIT_VER_RELEASE=0 +GIGEDIT_VER_RELEASE=1 #------------------------------------------------------------------------------------ # The following is the libtool / shared library version. This doesn't have to @@ -26,7 +26,7 @@ # 6. If any interfaces have been removed since the last public release, then set age # to 0. -LIBGIGEDIT_LT_CURRENT=0 +LIBGIGEDIT_LT_CURRENT=1 LIBGIGEDIT_LT_REVISION=0 LIBGIGEDIT_LT_AGE=0 @@ -102,8 +102,21 @@ # convert absolute LS plugin dir into relative dir # (see ch 27.10 of the automake manual, # "Installing to Hard-Coded Locations") - LINUXSAMPLER_PLUGIN_DIR=`echo "${LINUXSAMPLER_PLUGIN_DIR}" | sed 's/^.*\/lib\//\${libdir}\//g'` - echo "Relative plugin dir: ${LINUXSAMPLER_PLUGIN_DIR}" + # this one is extended to work with digit postfixed lib directories + # (e.g. "/usr/lib64/linuxsampler") as well + LINUXSAMPLER_PLUGIN_DIR=`echo "${LINUXSAMPLER_PLUGIN_DIR}" | sed 's/^.*\/lib[[0-9]]*\//\${libdir}\//g'` + if echo "${LINUXSAMPLER_PLUGIN_DIR}" | grep "\${libdir}" > /dev/null; then + echo "Relative plugin dir: ${LINUXSAMPLER_PLUGIN_DIR}" + else + echo "*********************************************************" + echo "* ! WARNING ! : Could not resolve LinuxSampler's plugin" + echo "* directory as relative path. This is probably not an" + echo "* issue if you're just going to install gigedit by" + echo "* 'make install', but it IS a problem if you're" + echo "* installing to a certain destination directory and/or" + echo "* compile in sandbox (e.g. Debian package or Gentoo emerge)" + echo "*********************************************************" + fi fi fi AC_SUBST(LINUXSAMPLER_CFLAGS) @@ -130,6 +143,7 @@ doc/quickstart/Makefile win32/libgigedit.dev win32/gigedit.dev + win32/gigedit.nsi win32/Makefile ]) AC_OUTPUT