Skip to content
Snippets Groups Projects
Commit 559f1fb1 authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

Merge branch 'jbonjean'

parents 67f845be 4d8a03d1
No related branches found
No related tags found
No related merge requests found
......@@ -67,9 +67,6 @@ AC_CONFIG_FILES([man/Makefile])
AC_CONFIG_FILES([doc/Makefile \
doc/doxygen/Makefile])
AC_CONFIG_FILES([platform/suse.spec \
platform/fedora.spec])
dnl the file stamp-h.in should be there before (instead of AC_CONFIG_HEADERS(config.h))
dnl AM_CONFIG_HEADER(config.h)
......
......@@ -21,7 +21,7 @@ configure-stamp:
dh_testdir
# Add here commands to configure the package.
./autogen.sh --prefix=/usr
cd libs/pjproject-1.0.1; ./autogen.sh
cd libs/pjproject-1.0.1; ./autogen.sh --prefix=/usr
touch configure-stamp
#Architecture
......@@ -31,8 +31,8 @@ build-arch: build-arch-stamp
build-arch-stamp: configure-stamp
# Add here commands to compile the arch part of the package.
$(MAKE)
cd libs/pjproject-1.0.1; $(MAKE) dep; $(MAKE)
cd libs/pjproject-1.0.1; $(MAKE) dep; $(MAKE) clean; $(MAKE)
cd -; $(MAKE)
touch $@
build-indep: build-indep-stamp
......
......@@ -7,14 +7,17 @@
# Author: Julien Bonjean (julien@bonjean.info)
#
# Creation Date: 2009-05-26
# Last Modified: 2009-05-26 11:55:12 -0400
# Last Modified: 2009-05-27 11:00:20 -0400
#####################################################
# it's only a workaround to generate config.guess and config.sub
# that are currently static
# this will generate errors but we don't care
aclocal --force >/dev/null 2>&1
automake --add-missing --force-missing --copy >/dev/null 2>&1
if [ -e /usr/share/misc/config.guess ]; then
rm -f config.sub config.guess
ln -s /usr/share/misc/config.sub .
ln -s /usr/share/misc/config.guess .
else
aclocal --force
automake --add-missing --force-missing --copy
fi
# now we launch configure
./configure $@
......
......@@ -3,4 +3,3 @@ dnl Dummy configure.ac for autotools
AC_INIT
LT_INIT
AC_OUTPUT
END
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment