diff options
author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-06 21:38:54 +0200 |
---|---|---|
committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-06 21:38:54 +0200 |
commit | 2839776b4fe1c282f3f2938d52408a51ca6def96 (patch) | |
tree | c3fb4489f4b8f5c8c650f772e864984d8c32e50c /misc | |
parent | a800128f70a60ab7544d4ed4d3bf101c3d1839d2 (diff) | |
parent | 6ca146bc0ffc2825402a8fb39b156394a614c1f0 (diff) | |
download | xine-lib-2839776b4fe1c282f3f2938d52408a51ca6def96.tar.gz xine-lib-2839776b4fe1c282f3f2938d52408a51ca6def96.tar.bz2 |
Merge changes from main repository.
Diffstat (limited to 'misc')
-rw-r--r-- | misc/Makefile.common | 39 |
1 files changed, 27 insertions, 12 deletions
diff --git a/misc/Makefile.common b/misc/Makefile.common index b3772941f..d23ea5b5e 100644 --- a/misc/Makefile.common +++ b/misc/Makefile.common @@ -5,6 +5,9 @@ xineincludedir = $(includedir)/xine xineplugdir = $(XINE_PLUGINDIR) xineplug_ldflags = $(NOUNDEF) -avoid-version -module +xinepostdir = $(XINE_PLUGINDIR)/post +vidixdir = $(XINE_PLUGINDIR)/vidix + $(XINE_LIB): @cd $(top_srcdir)/src/xine-engine && $(MAKE) @@ -15,14 +18,18 @@ install-data-hook: fi; \ fi; \ if test -x /usr/bin/chcon -a "`id -u`" -eq 0; then \ - list='$(lib_LTLIBRARIES)'; \ - if test -n "$$list" ; then \ + list='$(xineplug_LTLIBRARIES)'; \ for p in $$list; do \ p="`echo $$p | sed -e 's/\.la$$/\.so/g;s|^.*/||'`"; \ - echo " chcon system_u:object_r:texrel_shlib_t $(DESTDIR)$(libdir)/$$p"; \ - chcon system_u:object_r:texrel_shlib_t $(DESTDIR)$(libdir)/$$p || :; \ + echo " chcon system_u:object_r:texrel_shlib_t $(DESTDIR)$(xineplugdir)/$$p"; \ + chcon system_u:object_r:texrel_shlib_t $(DESTDIR)$(xineplugdir)/$$p || :; \ + done; \ + list='$(xinepost_LTLIBRARIES)'; \ + for p in $$list; do \ + p="`echo $$p | sed -e 's/\.la$$/\.so/g;s|^.*/||'`"; \ + echo " chcon system_u:object_r:texrel_shlib_t $(DESTDIR)$(xinepostdir)/$$p"; \ + chcon system_u:object_r:texrel_shlib_t $(DESTDIR)$(xinepostdir)/$$p || :; \ done; \ - fi; \ fi pass1: @@ -42,13 +49,21 @@ install-debug: debug $(MAKE) $(AM_MAKEFLAGS) install-data-hook uninstall-hook: - @if echo '$(libdir)' | egrep ^'$(XINE_PLUGINDIR)' >/dev/null; then \ - list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - p="`echo $$p | sed -e 's/\.la$$/\.so/g;s|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(libdir)/$$p"; \ - rm -f $(DESTDIR)$(libdir)/$$p; \ - done; \ - fi + @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ + p="`echo $$p | sed -e 's/\.la$$/\.so/g;s|^.*/||'`"; \ + echo " rm -f $(DESTDIR)$(xineplugdir)/$$p"; \ + rm -f $(DESTDIR)$(xineplugdir)/$$p; \ + done; + @list='$(xinepost_LTLIBRARIES)'; for p in $$list; do \ + p="`echo $$p | sed -e 's/\.la$$/\.so/g;s|^.*/||'`"; \ + echo " rm -f $(DESTDIR)$(xinepostdir)/$$p"; \ + rm -f $(DESTDIR)$(xinepostdir)/$$p; \ + done; + @list='$(vidix_LTLIBRARIES)'; for p in $$list; do \ + p="`echo $$p | sed -e 's/\.la$$/\.so/g;s|^.*/||'`"; \ + echo " rm -f $(DESTDIR)$(vidixdir)/$$p"; \ + rm -f $(DESTDIR)$(vidixdir)/$$p; \ + done; mostlyclean-generic: -rm -f *~ \#* .*~ .\#* |