* vlc-config.in.in: Reverted one of my first Solaris workarounds rendered

    obsolescent by the latest ones.

Makefile.am

@@ -370,10 +370,10 @@ endif
 # Install the modules and the symlinks
 install-exec-local:
 	for i in "" `$(VLC_CONFIG) --target plugin` ; do if test -n "$$i" ; then \
-	  $(INSTALL) -m 755 "modules/$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | cut -f1 -d/`" ; \
+	  $(INSTALL) -m 755 "$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | cut -f1 -d/`" ; \
 	fi ; done
 	for i in "" `$(VLC_CONFIG) --target builtin` `$(VLC_CONFIG) --target builtin pic` ; do if test -n "$$i" ; then \
-	  $(INSTALL) -m 644 "modules/$$i" "$(DESTDIR)$(libdir)/vlc" ; \
+	  $(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc" ; \
 	fi ; done
 	for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
 	  rm -f "$(DESTDIR)$(bindir)/$$i" && \
@@ -392,7 +392,7 @@ VLC.app: vlc
 	$(INSTALL) vlc $(srcdir)/VLC.app/Contents/MacOS/VLC
 	$(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/modules
 	for i in "" `$(VLC_CONFIG) --target plugin` ; do \
-	  if test -n "$$i" ; then $(INSTALL) "$(srcdir)/modules/$$i$(LIBEXT)" \
+	  if test -n "$$i" ; then $(INSTALL) "$(srcdir)/$$i$(LIBEXT)" \
 	    "$(srcdir)/VLC.app/Contents/MacOS/modules" ; \
 	  fi ; done
 	$(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/share
@@ -447,7 +447,7 @@ package-win32:
 	mkdir -p "$(srcdir)/tmp/plugins"
 	for i in "" `$(VLC_CONFIG) --target plugin` ; do \
 	  if test -n "$$i" ; then \
-	    $(INSTALL) "$(srcdir)/modules/$$i$(LIBEXT)" "$(srcdir)/tmp/plugins/" ; \
+	    $(INSTALL) "$(srcdir)/$$i$(LIBEXT)" "$(srcdir)/tmp/plugins/" ; \
 	  fi ; done
 
 	for i in "" $(srcdir)/tmp/plugins/*$(LIBEXT) ; \

vlc-config.in.in

@@ -243,7 +243,7 @@ if test "${echo_target}" = yes; then
     for module in `echo "${plugins}"`; do
       register_targets "${module}"
     done
-    for target in `echo ${list}`; do printf "${target}_plugin "; done
+    for target in `echo ${list}`; do printf "modules/${target}_plugin "; done
     printf '\n'
   fi
   if test "${echo_builtin}"; then
@@ -251,9 +251,9 @@ if test "${echo_target}" = yes; then
       register_targets "${module}"
     done
     if test "${echo_pic}"; then
-      for target in `echo ${list}`; do printf "${target}_pic.a "; done
+      for target in `echo ${list}`; do printf "modules/${target}_pic.a "; done
     else
-      for target in `echo ${list}`; do printf "${target}.a "; done
+      for target in `echo ${list}`; do printf "modules/${target}.a "; done
     fi
     printf '\n'
   fi
@@ -285,9 +285,9 @@ if test "${echo_libs}" = yes; then
       register_flags "${module}"
     done
     if test "${echo_pic}"; then
-      for target in `echo ${list}`; do printf "${target}_pic.a "; done
+      for target in `echo ${list}`; do printf "modules/${target}_pic.a "; done
     else
-      for target in `echo ${list}`; do printf "${target}.a "; done
+      for target in `echo ${list}`; do printf "modules/${target}.a "; done
     fi
     printf '\n'
   fi