From 5514f4870e6db98f99f3effcbd26d907805976d9 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Mon, 28 May 2001 19:30:32 +0000 Subject: [PATCH] --with-plugin-path now controls where plugins are installed, not just where to look for them. --- configure.in | 8 +++++++- libs/audio/targets/Makefile.am | 4 +++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 629981e7b..48c0ce5cd 100644 --- a/configure.in +++ b/configure.in @@ -1141,12 +1141,18 @@ pluginpath=$withval, pluginpath="auto") eval foo="$libdir" default_pluginpath="$foo/$PACKAGE" if test "x$pluginpath" = "xauto" -o "x$pluginpath" = "xyes" -o "x$pluginpath" = "x"; then - pluginpath="$default_pluginpath" + PLUGINDIR='${exec_prefix}/lib'/$PACKAGE + eval pluginpath="$PLUGINDIR" elif test "x$pluginpath" = xno; then + PLUGINDIR='${exec_prefix}/lib'/$PACKAGE pluginpath="." +else + PLUGINDIR=$pluginpath + eval pluginpath="$PLUGINDIR" fi AC_DEFINE_UNQUOTED(FS_PLUGINPATH, "$pluginpath") AC_SUBST(pluginpath) +AC_SUBST(PLUGINDIR) dnl CFLAGS for release and devel versions CFLAGS="" diff --git a/libs/audio/targets/Makefile.am b/libs/audio/targets/Makefile.am index a4d1359b6..f175c708b 100644 --- a/libs/audio/targets/Makefile.am +++ b/libs/audio/targets/Makefile.am @@ -1,6 +1,8 @@ INCLUDES= -I$(top_srcdir)/include $(ALSA_CFLAGS) $(MME_CFLAGS) $(OSS_CFLAGS) $(SGISND_CFLAGS) $(SUNSND_CFLAGS) $(WIN32SND_CFLAGS) $(SDL_CFLAGS) -pkglib_LTLIBRARIES = @SND_PLUGIN_TARGETS@ libsound_null.la libsound_disk.la +libdir = @PLUGINDIR@ + +lib_LTLIBRARIES = @SND_PLUGIN_TARGETS@ libsound_null.la libsound_disk.la EXTRA_LTLIBRARIES = libsound_sdl.la libsound_alsa0_5.la libsound_alsa0_9.la libsound_oss.la libsound_sgi.la libsound_sun.la libsound_win.la common_sound_files= snd_dma.c snd_mem.c snd_mix.c snd_mixa.S