summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Rytarowski <n54@gmx.com>2013-05-18 14:03:16 +0200
committerBrandon Philips <brandon@ifup.co>2013-05-18 21:42:24 -0700
commit8759e250048892c2eaef722976346e4c2ebc0e86 (patch)
treecd2de09f993077aafebfa4a99d3ab80481b11a57
parented7473437c553a00b68e806da55fdc6364493263 (diff)
downloadattr-8759e250048892c2eaef722976346e4c2ebc0e86.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/attr.spec.in (renamed from build/rpm/attr.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 080daba..4443fe0 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 libattr
-TOOL_SUBDIRS = attr getfattr setfattr examples test m4 man doc po debian build
+TOOL_SUBDIRS = attr getfattr setfattr examples test m4 man doc po debian package
SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS)
diff --git a/Makepkgs b/Makepkgs
index 406a4fb..2938656 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 77829c6..c4ea74d 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 attr/build where knowledge specific to each
+ subdirectory below attr/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 @@
attr/Logs/configure - `autoconf; ./configure' output
attr/Logs/default - `make default' output
- attr/Logs/dist - `make build dist' output
+ attr/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 85dc1c5..85dc1c5 100644
--- a/build/Makefile
+++ b/package/Makefile
diff --git a/build/rpm/Makefile b/package/rpm/Makefile
index 173c367..173c367 100644
--- a/build/rpm/Makefile
+++ b/package/rpm/Makefile
diff --git a/build/rpm/attr.spec.in b/package/rpm/attr.spec.in
index 493b881..493b881 100644
--- a/build/rpm/attr.spec.in
+++ b/package/rpm/attr.spec.in
diff --git a/build/rpm/macros.template b/package/rpm/macros.template
index 6ab46e1..6ab46e1 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 c27999d..c27999d 100644
--- a/build/tar/Makefile
+++ b/package/tar/Makefile