From 4301cdf1dfeac17224c15bfdfe4b43c1933ff316 Mon Sep 17 00:00:00 2001 From: runge Date: Sat, 5 Mar 2005 18:21:00 +0000 Subject: [PATCH] autoconf: rpm -> rpmbuild and echo -n -> printf --- ChangeLog | 3 +++ Makefile.am | 2 +- configure.ac | 2 +- libvncserver/Makefile.am | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b769313..543839f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2005-03-05 Karl Runge + * autoconf: rpm -> rpmbuild and echo -n -> printf + 2005-03-04 Karl Runge * libvncserver/{cargs.c,sockets.c}: add -listen option and rfbScreen member listenInterface. diff --git a/Makefile.am b/Makefile.am index 0f29ff6..15bde72 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,7 +17,7 @@ $(PACKAGE)-$(VERSION).tar.gz: dist # Rule to build RPM distribution package rpm: $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE).spec cp $(PACKAGE)-$(VERSION).tar.gz @RPMSOURCEDIR@ - rpm -ba $(PACKAGE).spec + rpmbuild -ba $(PACKAGE).spec endif all: make_config_executable diff --git a/configure.ac b/configure.ac index 1c85cc6..da1fd45 100644 --- a/configure.ac +++ b/configure.ac @@ -248,7 +248,7 @@ AC_CHECK_HEADER(ApplicationServices/ApplicationServices.h, HAVE_OSX="true") AM_CONDITIONAL(OSX, test "$HAVE_OSX" = "true") # Check for rpm SOURCES path -echo -n "checking for rpm sources path... " +printf "checking for rpm sources path... " RPMSOURCEDIR="NOT-FOUND" for directory in packages OpenLinux redhat RedHat rpm RPM "" ; do if test -d /usr/src/${directory}/SOURCES; then diff --git a/libvncserver/Makefile.am b/libvncserver/Makefile.am index a8fb971..0453b6a 100644 --- a/libvncserver/Makefile.am +++ b/libvncserver/Makefile.am @@ -36,7 +36,7 @@ $(PACKAGE)-$(VERSION).tar.gz: dist # Rule to build RPM distribution package rpm: $(PACKAGE)-$(VERSION).tar.gz libvncserver.spec cp $(PACKAGE)-$(VERSION).tar.gz @RPMSOURCEDIR@ - rpm -ba libvncserver.spec + rpmbuild -ba libvncserver.spec endif