mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-27 20:21:24 +00:00
Follow pygtk's lead in installing pygst.py and .pth in pyexecdir - this will do the right thing on multilib 64 bit
Original commit message from CVS: * Makefile.am: * configure.ac: Follow pygtk's lead in installing pygst.py and .pth in pyexecdir - this will do the right thing on multilib 64 bit
This commit is contained in:
parent
1e233d42c1
commit
c45f28f872
3 changed files with 16 additions and 13 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
2005-12-14 Thomas Vander Stichele <thomas at apestaart dot org>
|
||||||
|
|
||||||
|
* Makefile.am:
|
||||||
|
* configure.ac:
|
||||||
|
Follow pygtk's lead in installing pygst.py and .pth in pyexecdir -
|
||||||
|
this will do the right thing on multilib 64 bit
|
||||||
|
|
||||||
2005-12-12 Edward Hervey <edward@fluendo.com>
|
2005-12-12 Edward Hervey <edward@fluendo.com>
|
||||||
|
|
||||||
* examples/gstfile.py:
|
* examples/gstfile.py:
|
||||||
|
|
19
Makefile.am
19
Makefile.am
|
@ -20,22 +20,17 @@ pygst.py: $(top_srcdir)/pygst.py.in Makefile
|
||||||
chmod -w $@
|
chmod -w $@
|
||||||
|
|
||||||
# rewrite pygst path in installed pygst.py, install pth file.
|
# rewrite pygst path in installed pygst.py, install pth file.
|
||||||
install-data-local: Makefile
|
# they go in pyexecdir, should make 64bit users happy
|
||||||
$(mkinstalldirs) $(DESTDIR)$(pythondir)
|
install-exec-local: Makefile
|
||||||
sed -e "s|@PYGSTDIR\@|$(PYTHONDIR)/gst-$(GST_MAJORMINOR)|g" \
|
|
||||||
-e "s|@GST_MAJORMINOR\@|$(GST_MAJORMINOR)|g" \
|
|
||||||
$(srcdir)/pygst.py.in > $(DESTDIR)$(pythondir)/pygst.py
|
|
||||||
chmod 644 $(DESTDIR)$(pythondir)/pygst.py
|
|
||||||
echo "gst-$(GST_MAJORMINOR)" > $(DESTDIR)$(pythondir)/pygst.pth
|
|
||||||
|
|
||||||
# also install pth file in pyexec.
|
|
||||||
install-exec-local:
|
|
||||||
$(mkinstalldirs) $(DESTDIR)$(pyexecdir)
|
$(mkinstalldirs) $(DESTDIR)$(pyexecdir)
|
||||||
|
sed -e "s|@PYGSTDIR\@|$(PYEXECDIR)/gst-$(GST_MAJORMINOR)|g" \
|
||||||
|
-e "s|@GST_MAJORMINOR\@|$(GST_MAJORMINOR)|g" \
|
||||||
|
$(srcdir)/pygst.py.in > $(DESTDIR)$(pyexecdir)/pygst.py
|
||||||
|
chmod 644 $(DESTDIR)$(pyexecdir)/pygst.py
|
||||||
echo "gst-$(GST_MAJORMINOR)" > $(DESTDIR)$(pyexecdir)/pygst.pth
|
echo "gst-$(GST_MAJORMINOR)" > $(DESTDIR)$(pyexecdir)/pygst.pth
|
||||||
|
|
||||||
uninstall-local:
|
uninstall-local:
|
||||||
@rm $(DESTDIR)/$(pythondir)/pygst.py > /dev/null 2>&1 || true
|
@rm $(DESTDIR)/$(pyexecdir)/pygst.py > /dev/null 2>&1 || true
|
||||||
@rm $(DESTDIR)/$(pythondir)/pygst.pth > /dev/null 2>&1 || true
|
|
||||||
@rm $(DESTDIR)/$(pyexecdir)/pygst.pth > /dev/null 2>&1 || true
|
@rm $(DESTDIR)/$(pyexecdir)/pygst.pth > /dev/null 2>&1 || true
|
||||||
|
|
||||||
check-valgrind:
|
check-valgrind:
|
||||||
|
|
|
@ -92,7 +92,7 @@ fi
|
||||||
AC_SUBST(GST_NET_LIBS)
|
AC_SUBST(GST_NET_LIBS)
|
||||||
AC_SUBST(GST_NET_CFLAGS)
|
AC_SUBST(GST_NET_CFLAGS)
|
||||||
|
|
||||||
dnl check for gstreamer-net
|
dnl check for gst-plugins-base
|
||||||
PKG_CHECK_MODULES(GST_PLUGINS_BASE, gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ,
|
PKG_CHECK_MODULES(GST_PLUGINS_BASE, gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ,
|
||||||
HAVE_GST_PLUGINS_BASE="yes", HAVE_GST_PLUGINS_BASE="no")
|
HAVE_GST_PLUGINS_BASE="yes", HAVE_GST_PLUGINS_BASE="no")
|
||||||
|
|
||||||
|
@ -140,6 +140,7 @@ AC_SUBST(PYGST_CFLAGS)
|
||||||
|
|
||||||
dnl full installation path
|
dnl full installation path
|
||||||
AS_AC_EXPAND(PYTHONDIR, $pythondir)
|
AS_AC_EXPAND(PYTHONDIR, $pythondir)
|
||||||
|
AS_AC_EXPAND(PYEXECDIR, $pyexecdir)
|
||||||
|
|
||||||
dnl add debugging options ...
|
dnl add debugging options ...
|
||||||
changequote(,)dnl
|
changequote(,)dnl
|
||||||
|
|
Loading…
Reference in a new issue