Update of /cvsroot/libphidget/libphidget
In directory usw-pr-cvs1:/tmp/cvs-serv6578
Modified Files:
Makefile.am configure.in
Log Message:
- Package name adjusted: now it is 'libphidget'
- RPM build added. In order to build the source and binary RPM, just become
root and execute 'make rpm'.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/libphidget/libphidget/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.am 9 Sep 2002 09:40:42 -0000 1.5
--- Makefile.am 9 Sep 2002 22:57:32 -0000 1.6
***************
*** 39,40 ****
--- 39,57 ----
fi; \
done
+
+ rpm: dist
+
+ @ if @TEST@ -z "@RPM@" ; then \
+ @ECHO@ "RPM binary not found, can't build RPM package"; \
+ exit 1; \
+ fi
+
+ # VT: FIXME: It may be a good idea to check other dependencies
+ # required for a *complete* RPM build, such as Doxygen, and refuse
+ # to build the RPM, unless something like --enable-lazy-deps is
+ # provided
+
+ cd src/rpm && ${MAKE} @PACKAGE@.spec
+ @LN_S@ -f `pwd`/src/rpm/@PACKAGE@.spec /usr/src/redhat/SPECS/@PACKAGE@.spec
+ @LN_S@ -f `pwd`/@PACKAGE@-@VERSION@.tar.gz /usr/src/redhat/SOURCES/@PACKAGE@-@VERSION@.tar.gz
+ cd /usr/src/redhat/SPECS && @RPM@ -ba @PACKAGE@.spec
Index: configure.in
===================================================================
RCS file: /cvsroot/libphidget/libphidget/configure.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** configure.in 9 Sep 2002 09:40:43 -0000 1.5
--- configure.in 9 Sep 2002 22:57:32 -0000 1.6
***************
*** 6,10 ****
dnl of options, as well as the local set.
! GLOBAL_OPTIONS=/usr/local/share/phidget/configure-options
if test -f "${GLOBAL_OPTIONS}" && test -z "${GLOBAL_OPTIONS_PRESENT}" ; then
--- 6,10 ----
dnl of options, as well as the local set.
! GLOBAL_OPTIONS=/usr/local/share/libphidget/configure-options
if test -f "${GLOBAL_OPTIONS}" && test -z "${GLOBAL_OPTIONS_PRESENT}" ; then
***************
*** 36,40 ****
AC_SUBST(PATCHLEVEL)dnl
! PACKAGE="phidget"
VERSION="${VERSION_MAJOR}.${VERSION_MINOR}p${PATCHLEVEL}"
--- 36,40 ----
AC_SUBST(PATCHLEVEL)dnl
! PACKAGE="libphidget"
VERSION="${VERSION_MAJOR}.${VERSION_MINOR}p${PATCHLEVEL}"
***************
*** 44,48 ****
AC_MSG_RESULT(Configuring ${PACKAGE}-${VERSION})
! AC_PREFIX_DEFAULT(/opt/phidget)dnl
AC_PREREQ(2.13)dnl
AC_CONFIG_AUX_DIR(src/scripts/install)dnl
--- 44,48 ----
AC_MSG_RESULT(Configuring ${PACKAGE}-${VERSION})
! AC_PREFIX_DEFAULT(/opt/libphidget)dnl
AC_PREREQ(2.13)dnl
AC_CONFIG_AUX_DIR(src/scripts/install)dnl
***************
*** 90,93 ****
--- 90,95 ----
src/phidget++/Makefile
src/examples/Makefile
+ src/rpm/Makefile
+ src/rpm/libphidget.spec
)dnl
|