You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/02/22 17:52:11 UTC
[2/3] incubator-trafodion git commit: [TRAFODION-1835] Fix makefile
dependency bug and comment typo.
[TRAFODION-1835] Fix makefile dependency bug and comment typo.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/947428a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/947428a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/947428a8
Branch: refs/heads/master
Commit: 947428a839d2f6f67d41d1b34c8b93b2bcaeeb31
Parents: d683044
Author: Steve Varnau <st...@esgyn.com>
Authored: Fri Feb 19 01:13:38 2016 +0000
Committer: Steve Varnau <st...@esgyn.com>
Committed: Fri Feb 19 01:13:38 2016 +0000
----------------------------------------------------------------------
core/sqf/Makefile | 4 ++--
licenses/Makefile | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/947428a8/core/sqf/Makefile
----------------------------------------------------------------------
diff --git a/core/sqf/Makefile b/core/sqf/Makefile
index 4298584..873da82 100644
--- a/core/sqf/Makefile
+++ b/core/sqf/Makefile
@@ -326,11 +326,11 @@ tmp/sqenv.sh:
cat $(SQENV_MTYPE) >> tmp/sqenv.sh
# regular directories and files, following symlinks, minus simple links
-pkglist-files: pkglist-symlinks LICENSE NOTICE
+pkglist-files: pkglist-symlinks
find -L $(PKG_BIN_OBJS) -type d -o -type f | grep -v -xf pkglist-symlinks > $@
# simple symlinks that point to filename (does not start with . or /)
-pkglist-symlinks:
+pkglist-symlinks: LICENSE NOTICE
find $(PKG_BIN_OBJS) -lname '[^./]*' > $@
# Targets to tar/gzip the self installer
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/947428a8/licenses/Makefile
----------------------------------------------------------------------
diff --git a/licenses/Makefile b/licenses/Makefile
index 6760eef..597c080 100644
--- a/licenses/Makefile
+++ b/licenses/Makefile
@@ -25,7 +25,7 @@ all: LICENSE-src LICENSE-dcs LICENSE-server LICENSE-install LICENSE-rest LICENSE
LICENSE-src:
cat Apache lic-components-src lic-dcs-src lic-server-src lic-test-src > $@
-# Binary licenses for each separtely packaged component
+# Binary licenses for each separately packaged component
# Must include source licenses as well as software bundled in at build time
LICENSE-dcs:
cat Apache lic-dcs-src lic-dcs-bin > $@