hawq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject incubator-hawq git commit: HAWQ-87. Make install packages of pljava and pgcrypto.
Date Wed, 28 Oct 2015 02:14:44 GMT
Repository: incubator-hawq
Updated Branches:
  refs/heads/master 162b70a8f -> 01f15314f


HAWQ-87. Make install packages of pljava and pgcrypto.


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/01f15314
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/01f15314
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/01f15314

Branch: refs/heads/master
Commit: 01f15314f8d680706163ccc19980c2a3792bd2e6
Parents: 162b70a
Author: rlei <rlei@pivotal.io>
Authored: Tue Oct 27 07:35:49 2015 -0700
Committer: rlei <rlei@pivotal.io>
Committed: Wed Oct 28 10:13:58 2015 +0800

----------------------------------------------------------------------
 contrib/pgcrypto/Makefile         | 1 -
 contrib/pgcrypto/package/Makefile | 6 ++----
 src/pl/pljava/package/Makefile    | 5 +----
 3 files changed, 3 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/01f15314/contrib/pgcrypto/Makefile
----------------------------------------------------------------------
diff --git a/contrib/pgcrypto/Makefile b/contrib/pgcrypto/Makefile
index 6f27cac..5cd37b2 100644
--- a/contrib/pgcrypto/Makefile
+++ b/contrib/pgcrypto/Makefile
@@ -47,7 +47,6 @@ else
 subdir = contrib/pgcrypto
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
-include $(top_srcdir)/contrib/contrib-global.mk
 endif
 
 # Add libraries that pgcrypto depends (or might depend) on into the

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/01f15314/contrib/pgcrypto/package/Makefile
----------------------------------------------------------------------
diff --git a/contrib/pgcrypto/package/Makefile b/contrib/pgcrypto/package/Makefile
index 9f29086..fa6494d 100644
--- a/contrib/pgcrypto/package/Makefile
+++ b/contrib/pgcrypto/package/Makefile
@@ -1,8 +1,6 @@
 all: gppkg
 
-BLD_TOP=../../../
-GPMGMT=$(BLD_TOP)/tools
-include $(BLD_TOP)/build-utils/pivotal/Makefile.global
+BLD_TOP=./../../../
 include $(BLD_TOP)/src/VERSIONS.mk
 
 OS=$(word 1,$(subst _, ,$(BLD_ARCH)))
@@ -21,7 +19,7 @@ EXTRA_CLEAN+=$(PGCRYPTO_RPM) $(PGCRYPTO_GPPKG)
 #
 # Generic rules to build gppkgs included here
 #
-include $(BLD_TOP)/build-utils/pivotal/gppkg.mk
+include $(BLD_TOP)/../build-utils/makefiles/gppkg.mk
 
 gppkg: 
 	$(MAKE) $(PGCRYPTO_RPM) RPM_FLAGS=$(PGCRYPTO_RPM_FLAGS)

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/01f15314/src/pl/pljava/package/Makefile
----------------------------------------------------------------------
diff --git a/src/pl/pljava/package/Makefile b/src/pl/pljava/package/Makefile
index b8a688a..d8e6b66 100644
--- a/src/pl/pljava/package/Makefile
+++ b/src/pl/pljava/package/Makefile
@@ -1,9 +1,6 @@
 all: gppkg
 
 BLD_TOP=../../../../
-GPMGMT=$(BLD_TOP)/tools
-include $(BLD_TOP)/build-utils/pivotal/tools.mk
-include $(BLD_TOP)/build-utils/pivotal/Makefile.global
 
 include $(BLD_TOP)/src/VERSIONS.mk
 
@@ -23,7 +20,7 @@ EXTRA_CLEAN+=$(PLJAVA_RPM) $(PLJAVA_GPPKG)
 #
 # Generic rules to build gppkgs included here
 #
-include $(BLD_TOP)/build-utils/pivotal/gppkg.mk
+include $(BLD_TOP)/../build-utils/makefiles/gppkg.mk
 
 gppkg:
 	$(MAKE) $(PLJAVA_RPM) RPM_FLAGS=$(PLJAVA_RPM_FLAGS)


Mime
View raw message