Merge -newbuild.

5 files changed, 17 insertions, 27 deletions

diff --git a/misc/Makefile.common b/misc/Makefile.common
index a3fe43de6..edafcea4b 100644
--- a/misc/Makefile.common
+++ b/misc/Makefile.common
@@ -9,7 +9,7 @@ xinepostdir = $(XINE_PLUGINDIR)/post
 vidixdir = $(XINE_PLUGINDIR)/vidix
 
 $(XINE_LIB):
-	@cd $(top_srcdir)/src/xine-engine && $(MAKE)
+	$(MAKE) -C $(top_builddir)/src/xine-engine
 
 $(top_builddir)/contrib/libxdg-basedir/libxdg-basedir.la:
 	$(MAKE) -C $(top_builddir)/contrib/libxdg-basedir
@@ -41,16 +41,6 @@ pass1:
 pass2:
 	@$(MAKE) MULTIPASS_CFLAGS="$(PASS2_CFLAGS)"
 
-debug:
-	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
-
-install-debug: debug
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-	@list='$(SUBDIRS)'; for subdir in $$list; do \
-	  (cd $$subdir && $(MAKE) $@) || exit; \
-	done;
-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-
 uninstall-hook:
 	@list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \
 	  p="`echo $$p | sed -e 's/\.la$$/\.so/g;s|^.*/||'`"; \
diff --git a/misc/SlackBuild.in b/misc/SlackBuild.in
index d356a1766..118613c6a 100644
--- a/misc/SlackBuild.in
+++ b/misc/SlackBuild.in
@@ -27,7 +27,7 @@ EOF
 #
 do_descr() {
 cat > package_descriptions << EOF
-@PACKAGE@: @PACKAGE@ @SPEC_VERSION@.
+@PACKAGE@: @PACKAGE@ @PACKAGE_VERSION@.
 @PACKAGE@:
 @PACKAGE@: xine-lib is the beating heart of xine (a free gpl-licensed 
 @PACKAGE@: video player for unix-like systems) which among others provides 
@@ -53,12 +53,12 @@ do_build() {
   cd $CWD
   rm -rf $TMPBUILD
   mkdir -p $TMPBUILD
-  cd $TMPBUILD && tar -xzf $CWD/@TAR_NAME@.tar.gz
+  cd $TMPBUILD && tar -xzf $CWD/@PACKAGE_TARNAME@.tar.gz
   do_install_sh;
-  cd @TAR_NAME@
+  cd @PACKAGE_TARNAME@
   DIE=1
-  echo "./configure --prefix=$PREFIX $CONFIG_OPT && make && make install-strip DESTDIR=$PKG LIBRARY_PATH=$TMPBUILD/@TAR_NAME@/src/xine-engine/.libs" && \
-  ./configure --prefix=$PREFIX $CONFIG_OPT && make && make install-strip DESTDIR=$PKG LIBRARY_PATH=$TMPBUILD/@TAR_NAME@/src/xine-engine/.libs && \
+  echo "./configure --prefix=$PREFIX $CONFIG_OPT && make && make install-strip DESTDIR=$PKG LIBRARY_PATH=$TMPBUILD/@PACKAGE_TARNAME@/src/xine-engine/.libs" && \
+  ./configure --prefix=$PREFIX $CONFIG_OPT && make && make install-strip DESTDIR=$PKG LIBRARY_PATH=$TMPBUILD/@PACKAGE_TARNAME@/src/xine-engine/.libs && \
   mkdir -p $PKG/install && cp $TMPBUILD/doinst.sh $PKG/install && \
   cd $PKG && \
   echo "n" | /sbin/makepkg $PACKAGE && \
@@ -172,7 +172,7 @@ main() {
   build_pentium
   build_k6
   build_k7
-  mv -f $CWD/@TAR_NAME@.tar.gz $SLCK
+  mv -f $CWD/@PACKAGE_TARNAME@.tar.gz $SLCK
 }
 
 
@@ -184,7 +184,7 @@ build_arch() {
       mkdir -p $SLCK
       rm -f config.cache && ./autogen.sh && make dist
       $barch
-      mv -f $CWD/@TAR_NAME@.tar.gz $SLCK
+      mv -f $CWD/@PACKAGE_TARNAME@.tar.gz $SLCK
 }
 
 case "$1" in
diff --git a/misc/build_rpms.sh.in b/misc/build_rpms.sh.in
index b3ec065b1..c3096e5f0 100644
--- a/misc/build_rpms.sh.in
+++ b/misc/build_rpms.sh.in
@@ -44,9 +44,9 @@ export XINE_BUILD=i586-pc-linux-gnu
 
 eval $RPM_BA
 
-mv /usr/src/redhat/SRPMS/libxine-@SPEC_VERSION@-$DATE.src.rpm ./rpms/
-mv /usr/src/redhat/RPMS/i386/$PKGNAME-@SPEC_VERSION@-$DATE.i386.rpm ./rpms/$PKGNAME-@SPEC_VERSION@-$DATE.i586.rpm
-mv /usr/src/redhat/RPMS/i386/$PKGNAME-devel-@SPEC_VERSION@-$DATE.i386.rpm ./rpms/$PKGNAME-devel-@SPEC_VERSION@-$DATE.i586.rpm
+mv /usr/src/redhat/SRPMS/libxine-@PACKAGE_VERSION@-$DATE.src.rpm ./rpms/
+mv /usr/src/redhat/RPMS/i386/$PKGNAME-@PACKAGE_VERSION@-$DATE.i386.rpm ./rpms/$PKGNAME-@PACKAGE_VERSION@-$DATE.i586.rpm
+mv /usr/src/redhat/RPMS/i386/$PKGNAME-devel-@PACKAGE_VERSION@-$DATE.i386.rpm ./rpms/$PKGNAME-devel-@PACKAGE_VERSION@-$DATE.i586.rpm
 
 echo "*****************************************************"
 echo
@@ -61,7 +61,7 @@ export XINE_BUILD=i686-pc-linux-gnu
 
 eval $RPM_BB
 
-mv /usr/src/redhat/RPMS/i386/$PKGNAME-@SPEC_VERSION@-$DATE.i386.rpm ./rpms/$PKGNAME-@SPEC_VERSION@-$DATE.i686.rpm
+mv /usr/src/redhat/RPMS/i386/$PKGNAME-@PACKAGE_VERSION@-$DATE.i386.rpm ./rpms/$PKGNAME-@PACKAGE_VERSION@-$DATE.i686.rpm
 
 echo "*****************************************************"
 echo
@@ -76,7 +76,7 @@ export XINE_BUILD=k6-pc-linux-gnu
 
 eval $RPM_BB
 
-mv /usr/src/redhat/RPMS/i386/$PKGNAME-@SPEC_VERSION@-$DATE.i386.rpm ./rpms/$PKGNAME-@SPEC_VERSION@-$DATE.k6.rpm
+mv /usr/src/redhat/RPMS/i386/$PKGNAME-@PACKAGE_VERSION@-$DATE.i386.rpm ./rpms/$PKGNAME-@PACKAGE_VERSION@-$DATE.k6.rpm
 
 echo "*****************************************************"
 echo
@@ -91,6 +91,6 @@ export XINE_BUILD=athlon-pc-linux-gnu
 
 eval $RPM_BB
 
-mv /usr/src/redhat/RPMS/i386/$PKGNAME-@SPEC_VERSION@-$DATE.i386.rpm ./rpms/$PKGNAME-@SPEC_VERSION@-$DATE.k7.rpm
+mv /usr/src/redhat/RPMS/i386/$PKGNAME-@PACKAGE_VERSION@-$DATE.i386.rpm ./rpms/$PKGNAME-@PACKAGE_VERSION@-$DATE.k7.rpm
 
 echo "Done."
diff --git a/misc/relchk.sh.in b/misc/relchk.sh.in
index 242a97486..09cce24b2 100755
--- a/misc/relchk.sh.in
+++ b/misc/relchk.sh.in
@@ -4,7 +4,7 @@
 ##
 
 topdir="`pwd`"
-distdir="@TAR_NAME@"
+distdir="@PACKAGE_TARNAME@"
 log="$topdir/dist-log"
 logerror="$topdir/dist-errors"
 
diff --git a/misc/xine-lib.spec.in b/misc/xine-lib.spec.in
index 2b182e8ad..6c5d9b96c 100644
--- a/misc/xine-lib.spec.in
+++ b/misc/xine-lib.spec.in
@@ -1,6 +1,6 @@
 %define shortname  libxine
 %define name       libxine2
-%define version    @SPEC_VERSION@
+%define version    @PACKAGE_VERSION@
 %define release    0
 
 %define major      1
@@ -642,7 +642,7 @@ libxine Soundausgabeplugin für den jack-Soundserver
 %endif
 
 %prep
-%setup -q -n @TAR_NAME@
+%setup -q -n @PACKAGE_TARNAME@
 
 %build
 export CFLAGS="${RPM_OPT_FLAGS}"