summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Philips <brandon@ifup.co>2013-05-18 21:48:55 -0700
committerBrandon Philips <brandon@ifup.co>2013-05-18 21:48:55 -0700
commitebef346aaaeaacdb5376ff52ac1ff766868f7206 (patch)
tree0e7ab5691c0d3114b2463cc5b9b86b76efe075aa
parent091545b6d0b673ee03aedb5abc7bbc78977de6a4 (diff)
downloadacl-ebef346aaaeaacdb5376ff52ac1ff766868f7206.tar.gz
Rename build/ to package/
Keep build/ directory for out-of-source builds.
-rw-r--r--Makefile2
-rwxr-xr-xMakepkgs4
-rw-r--r--doc/PORTING4
-rw-r--r--package/Makefile (renamed from build/Makefile)0
-rw-r--r--package/rpm/Makefile (renamed from build/rpm/Makefile)0
-rw-r--r--package/rpm/acl.spec.in (renamed from build/rpm/acl.spec.in)0
-rw-r--r--package/rpm/macros.template (renamed from build/rpm/macros.template)0
-rw-r--r--package/rpm/rpm-2.rc.template (renamed from build/rpm/rpm-2.rc.template)0
-rw-r--r--package/tar/Makefile (renamed from build/tar/Makefile)0
9 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 6969443..dce32d3 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ LDIRT = config.log .dep config.status config.cache confdefs.h conftest* \
Logs/* built .census install.* install-dev.* install-lib.* *.gz
LIB_SUBDIRS = include libmisc libacl
-TOOL_SUBDIRS = getfacl setfacl chacl m4 man doc po test examples build debian
+TOOL_SUBDIRS = getfacl setfacl chacl m4 man doc po test examples package debian
SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS)
diff --git a/Makepkgs b/Makepkgs
index bc463df..8d20be9 100755
--- a/Makepkgs
+++ b/Makepkgs
@@ -94,9 +94,9 @@ echo
echo "== dist, log is $LOGDIR/dist"
[ ! -f .census ] && touch .census
if $verbose ; then
- $MAKE -C build dist 2>&1 | tee $LOGDIR/dist
+ $MAKE -C package dist 2>&1 | tee $LOGDIR/dist
else
- $MAKE -C build dist > $LOGDIR/dist 2>&1 || exit 1
+ $MAKE -C package dist > $LOGDIR/dist 2>&1 || exit 1
grep '^Wrote:' $LOGDIR/dist | sed -e 's/\.\.\/\.\.\///'
fi
diff --git a/doc/PORTING b/doc/PORTING
index f395b7a..eb39d5e 100644
--- a/doc/PORTING
+++ b/doc/PORTING
@@ -72,7 +72,7 @@
# ./Makepkgs
this script generates all of the packages supported - each has a
- subdirectory below acl/build where knowledge specific to each
+ subdirectory below acl/package where knowledge specific to each
package type is maintained.
The script produces logs of each stage of the build (this info is
@@ -80,7 +80,7 @@
acl/Logs/configure - `autoconf; ./configure' output
acl/Logs/default - `make default' output
- acl/Logs/dist - `make build dist' output
+ acl/Logs/dist - `make package dist' output
On successful completion, the script echoes the names of packages
successfully generated.
diff --git a/build/Makefile b/package/Makefile
index 0e87a20..0e87a20 100644
--- a/build/Makefile
+++ b/package/Makefile
diff --git a/build/rpm/Makefile b/package/rpm/Makefile
index 041b84c..041b84c 100644
--- a/build/rpm/Makefile
+++ b/package/rpm/Makefile
diff --git a/build/rpm/acl.spec.in b/package/rpm/acl.spec.in
index 7946462..7946462 100644
--- a/build/rpm/acl.spec.in
+++ b/package/rpm/acl.spec.in
diff --git a/build/rpm/macros.template b/package/rpm/macros.template
index 4557242..4557242 100644
--- a/build/rpm/macros.template
+++ b/package/rpm/macros.template
diff --git a/build/rpm/rpm-2.rc.template b/package/rpm/rpm-2.rc.template
index f3b3eba..f3b3eba 100644
--- a/build/rpm/rpm-2.rc.template
+++ b/package/rpm/rpm-2.rc.template
diff --git a/build/tar/Makefile b/package/tar/Makefile
index 31c8f92..31c8f92 100644
--- a/build/tar/Makefile
+++ b/package/tar/Makefile