RPA Toolkit
build modification on Linux
authorMartin Stoilov <martin@rpasearch.com>
Thu, 28 Jul 2011 04:18:51 +0000 (21:18 -0700)
committerMartin Stoilov <martin@rpasearch.com>
Thu, 28 Jul 2011 04:18:51 +0000 (21:18 -0700)
build/linux/build.mk
rgrep/build/linux/rgrep.mk
rlib/build/linux/rlib.mk
rpa/build/linux/rpa.mk
rpa/rpadbex.c
rpa/rpadbex.h
rvm/build/linux/rvm.mk

index 15bb983..4b579f5 100644 (file)
@@ -46,6 +46,7 @@ install: $(RPATK_INC_INSTALL) $(RPATK_INC_INSTALL)/rlib $(RPATK_INC_INSTALL)/rvm
        +make -C $(SRCDIR)/rpa/build/$(OS)/$(ARCHDIR) install
        +make -C $(SRCDIR)/rvm/build/$(OS)/$(ARCHDIR) install
        +make -C $(SRCDIR)/rgrep/build/$(OS)/$(ARCHDIR) install
+       ldconfig -n $(RTK_LIB_INSTALL)
 
 uninstall:
        +make -C $(SRCDIR)/rlib/build/$(OS)/$(ARCHDIR) uninstall
index 7f93675..10af5a0 100644 (file)
@@ -45,6 +45,6 @@ install:
        cp $(OUTDIR)/$(RPAGREP) $(RPAGREP_BIN_INSTALL)
 
 uninstall:
-       rm $(RPAGREP_BIN_INSTALL)/$(RPAGREP)
+       -rm $(RPAGREP_BIN_INSTALL)/$(RPAGREP)
 
 
index c248e69..6f2b4cc 100644 (file)
@@ -65,6 +65,6 @@ install:
 
 
 uninstall:
-       rm $(RPATK_LIB_INSTALL)/$(RLIB_LIB)
-       rm $(RPATK_LIB_INSTALL)/$(RLIB_SO)
-       rm $(RPATK_INC_INSTALL)/rlib/*
+       -rm $(RPATK_LIB_INSTALL)/$(RLIB_LIB)
+       -rm $(RPATK_LIB_INSTALL)/$(RLIB_SO_NAME)*
+       -rm $(RPATK_INC_INSTALL)/rlib/*
index e9e164f..e506298 100644 (file)
@@ -57,6 +57,6 @@ install:
        cp $(RPA_SRCDIR)/*.h $(RPATK_INC_INSTALL)/rpa
 
 uninstall:
-       rm $(RTK_LIB_INSTALL)/$(RPA_LIB)
-       rm $(RTK_LIB_INSTALL)/$(RPA_SO)
-       rm $(RPATK_INC_INSTALL)/rpa/*
+       -rm $(RTK_LIB_INSTALL)/$(RPA_LIB)
+       -rm $(RTK_LIB_INSTALL)/$(RPA_SO_NAME)*
+       -rm $(RPATK_INC_INSTALL)/rpa/*
index 60182d9..6c1cca4 100644 (file)
@@ -1797,7 +1797,7 @@ long rpa_dbex_lasterrorinfo(rpadbex_t *dbex, rpa_errinfo_t *errinfo)
 
 const char *rpa_dbex_version()
 {
-       return "2.0";
+       return RPA_VERSION;
 }
 
 
index 3ca3223..92292c9 100644 (file)
@@ -66,6 +66,7 @@ typedef struct rpadbex_s rpadbex_t;
  */
 typedef long rparule_t;
 
+#define RPA_VERSION "2.0"
 #define RPA_DBEXCFG_OPTIMIZATIONS 1
 #define RPA_DBEXCFG_DEBUG 2
 #define RPA_DBEXCFG_BITMAP 3
index f77603d..93c3c5a 100644 (file)
@@ -80,6 +80,6 @@ install:
        cp $(RVM_SRCDIR)/*.h $(RPATK_INC_INSTALL)/rvm
 
 uninstall:
-       rm $(RTK_LIB_INSTALL)/$(RVM_LIB)
-       rm $(RTK_LIB_INSTALL)/$(RVM_SO)
-       rm $(RPATK_INC_INSTALL)/rvm/*
+       -rm $(RTK_LIB_INSTALL)/$(RVM_LIB)
+       -rm $(RTK_LIB_INSTALL)/$(RVM_SO_NAME)*
+       -rm $(RPATK_INC_INSTALL)/rvm/*