[Sumover-dev] [svn commit] r4414 - rat/trunk

[sumover-dev at cs.ucl.ac.uk]

Author: douglask
Date: Mon Apr 13 05:59:30 2009
New Revision: 4414

Modified:
   rat/trunk/Makefile.in
   rat/trunk/configure.in

Log:
Add support for DESTDIR env variable in Makefile install rule.

Initial support for finding libuclmmbase shared library and header file in location other than ../common/src.


Modified: rat/trunk/Makefile.in
==============================================================================
--- rat/trunk/Makefile.in	(original)
+++ rat/trunk/Makefile.in	Mon Apr 13 05:59:30 2009
@@ -15,6 +15,7 @@
 RANLIB  = @RANLIB@
 ECHO    = echo
 STRIP	= strip
+INSTALL	= @INSTALL@
 
 VERSION = @VERSION@
 RATVER  = rat-$(VERSION)
@@ -164,17 +165,24 @@
 	-rm -f rat $(RATVER)-media $(RATVER)-ui $(RATVER)-kill $(RATVER)
 
 distclean: clean
-	-rm -rf config.cache config.log config.status ratconf.h Makefile
+	-rm -rf autom4te.cache config.cache config.log config.status
+	-rm -rf ratconf.h Makefile
 	-rm -rf core core-$(RATVER)-media core-$(RATVER)-ui
 
 install: all
-	./install-sh -m 555 -c rat             $(bindir)
-	./install-sh -m 555 -c $(RATVER)       $(bindir)
-	./install-sh -m 555 -c $(RATVER)-kill  $(bindir)/rat-kill
-	./install-sh -m 555 -c $(RATVER)-media $(bindir)
-	./install-sh -m 555 -c $(RATVER)-ui    $(bindir)
-	./install-sh -m 444 -c man/man1/rat.1  $(mandir)/man1/rat.1
-	./install-sh -m 444 -c sdr2.plugin.S02.audio.rtp.-.$(RATVER) $(sysconfdir)/sdr/plugins
+	test -d $(DESTDIR)$(bindir || \
+		$(INSTALL) -d $(DESTDIR)$(bindir)
+	test -d $(DESTDIR)$(mandir)/man1 || \
+		$(INSTALL) -d $(DESTDIR)$(mandir)/man1
+	test -d $(DESTDIR)$(sysconfdir)/sdr/plugins || \
+		$(INSTALL) -d $(DESTDIR)$(sysconfdir)/sdr/plugins
+	$(INSTALL) -m 555 -c rat             $(DESTDIR)$(bindir)
+	$(INSTALL) -m 555 -c $(RATVER)       $(DESTDIR)$(bindir)
+	$(INSTALL) -m 555 -c $(RATVER)-kill  $(DESTDIR)$(bindir)/rat-kill
+	$(INSTALL) -m 555 -c $(RATVER)-media $(DESTDIR)$(bindir)
+	$(INSTALL) -m 555 -c $(RATVER)-ui    $(DESTDIR)$(bindir)
+	$(INSTALL) -m 444 -c man/man1/rat.1  $(DESTDIR)$(mandir)/man1/rat.1
+	$(INSTALL) -m 444 -c sdr2.plugin.S02.audio.rtp.-.$(RATVER) $(DESTDIR)$(sysconfdir)/sdr/plugins
 
 installer: $(RATVER)-installer
 	mkdir release
@@ -211,17 +219,9 @@
 
 rpm: clean tgz 
 	@${ECHO} "Building $(RATVER).rpm -- this almost certainly needs to run as root on RedHat Linux"
-#	install -m 644 $(RATVER)-$(OSTYPE).tar.gz /usr/src/redhat/SOURCES/rat-4.1.2.tar.gz
-	install -m 644 AccessGrid-rat.spec /usr/src/redhat/SPECS/AccessGrid-rat.spec
 	install -m 644 $(RATVER)-$(OSTYPE).tar.gz /usr/src/redhat/SOURCES/$(RATVER)-$(OSTYPE).tar.gz
 	rpm -bb $(RATVER).spec
 
-agrpm: clean
-	@${ECHO} "Building AG $(RATVER).rpm -- this almost certainly needs to run as root on RedHat Linux"
-	( cd ../.. ; ln -s ag-rat $(RATVER) ; tar cvfh /usr/src/redhat/SOURCES/$(RATVER).tar.gz $(RATVER) ; rm $(RATVER) )
-	install -m 644 AccessGrid-rat.spec /usr/src/redhat/SPECS/AccessGrid-rat.spec
-	rpm -ba AccessGrid-rat.spec
-
 Makefile: Makefile.in VERSION
 	$(error "Run configure again, the following file(s) are newer than Makefile: $?")
 

Modified: rat/trunk/configure.in
==============================================================================
--- rat/trunk/configure.in	(original)
+++ rat/trunk/configure.in	Mon Apr 13 05:59:30 2009
@@ -10,6 +10,7 @@
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_RANLIB
+AC_PROG_INSTALL
 
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
@@ -366,7 +367,7 @@
 	  COMMON_LIB=${DEFAULT_COMMON_LIB} ])
 
 FOUND_COMMON_H=no
-for h in ${COMMON_INC} ${COMMON_INC}/include ${COMMON_INC}/include/common-mml
+for h in ${COMMON_INC} ${COMMON_INC}/include ${COMMON_INC}/include/common-mml ${COMMON_INC}/include/uclmmbase /usr/include/uclmmbase
 do
 AC_CHECK_HEADER($h/mbus.h,
 	[
@@ -386,7 +387,7 @@
 fi
 
 # Check if installed it on it's own...
-if test ! -d ${COMMON_LIB} 
+if test ! -d ${COMMON_LIB}
 then
 	COMMON_LIB=${COMMON_LIB}/lib
 fi
@@ -411,15 +412,20 @@
 ], -L${COMMON_LIB})
 
 # Convert paths into compiler arguments
+
+if test "${COMMON_INC}" = "/usr/include/uclmmbase"
+then
+	COMMON_LIB="-luclmmbase"
+else
+	COMMON_LIB="-L${COMMON_LIB} -luclmmbase"
+	EXTERNAL_DEP="${EXTERNAL_DEP} ${COMMON_DEP}"
+fi
 COMMON_INC="-I${COMMON_INC}"
 AC_SUBST(COMMON_INC)
-
-COMMON_LIB="-L${COMMON_LIB} -luclmmbase"
 AC_SUBST(COMMON_LIB)
-
-EXTERNAL_DEP="${EXTERNAL_DEP} ${COMMON_DEP}"
 AC_SUBST(EXTERNAL_DEP)
 
+
 # GSM flag checks
 #-----------------------------------------------------------------------------
 # Check if Signed arithmetic shift right (SASR).  If SASR then -1 >> 1 == 1.