Changeset dceb44290badf3c971a0d6ef87999d9e041623b7

Show
Ignore:
Timestamp:
07/01/03 20:28:43 (5 years ago)
Author:
Sam Hocevar <sam@videolan.org>
git-committer:
Sam Hocevar <sam@videolan.org> 1057084123 +0000
git-parent:

[da38547a70b6865a6280e2c48415fccaaca08f31]

git-author:
Sam Hocevar <sam@videolan.org> 1057084123 +0000
Message:
  • vlc-config.in.in: Reverted one of my first Solaris workarounds rendered
    obsolescent by the latest ones.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • Makefile.am

    re2d69c7 rdceb442  
    371371install-exec-local: 
    372372    for i in "" `$(VLC_CONFIG) --target plugin` ; do if test -n "$$i" ; then \ 
    373       $(INSTALL) -m 755 "modules/$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | cut -f1 -d/`" ; \ 
     373      $(INSTALL) -m 755 "$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | cut -f1 -d/`" ; \ 
    374374    fi ; done 
    375375    for i in "" `$(VLC_CONFIG) --target builtin` `$(VLC_CONFIG) --target builtin pic` ; do if test -n "$$i" ; then \ 
    376       $(INSTALL) -m 644 "modules/$$i" "$(DESTDIR)$(libdir)/vlc" ; \ 
     376      $(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc" ; \ 
    377377    fi ; done 
    378378    for i in "" $(ALIASES) ; do if test -n "$$i" ; then \ 
    …… 
    393393    $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/modules 
    394394    for i in "" `$(VLC_CONFIG) --target plugin` ; do \ 
    395       if test -n "$$i" ; then $(INSTALL) "$(srcdir)/modules/$$i$(LIBEXT)" \ 
     395      if test -n "$$i" ; then $(INSTALL) "$(srcdir)/$$i$(LIBEXT)" \ 
    396396        "$(srcdir)/VLC.app/Contents/MacOS/modules" ; \ 
    397397      fi ; done 
    …… 
    448448    for i in "" `$(VLC_CONFIG) --target plugin` ; do \ 
    449449      if test -n "$$i" ; then \ 
    450         $(INSTALL) "$(srcdir)/modules/$$i$(LIBEXT)" "$(srcdir)/tmp/plugins/" ; \ 
     450        $(INSTALL) "$(srcdir)/$$i$(LIBEXT)" "$(srcdir)/tmp/plugins/" ; \ 
    451451      fi ; done 
    452452 

  • vlc-config.in.in

    r1fb282c rdceb442  
    244244      register_targets "${module}" 
    245245    done 
    246     for target in `echo ${list}`; do printf "${target}_plugin "; done 
     246    for target in `echo ${list}`; do printf "modules/${target}_plugin "; done 
    247247    printf '\n' 
    248248  fi 
    …… 
    252252    done 
    253253    if test "${echo_pic}"; then 
    254       for target in `echo ${list}`; do printf "${target}_pic.a "; done 
     254      for target in `echo ${list}`; do printf "modules/${target}_pic.a "; done 
    255255    else 
    256       for target in `echo ${list}`; do printf "${target}.a "; done 
     256      for target in `echo ${list}`; do printf "modules/${target}.a "; done 
    257257    fi 
    258258    printf '\n' 
    …… 
    286286    done 
    287287    if test "${echo_pic}"; then 
    288       for target in `echo ${list}`; do printf "${target}_pic.a "; done 
     288      for target in `echo ${list}`; do printf "modules/${target}_pic.a "; done 
    289289    else 
    290       for target in `echo ${list}`; do printf "${target}.a "; done 
     290      for target in `echo ${list}`; do printf "modules/${target}.a "; done 
    291291    fi 
    292292    printf '\n'