aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilly Tarreau <w@1wt.eu>2006-07-16 14:53:36 +0200
committerWilly Tarreau <willy@wtap.(none)>2006-07-26 11:51:24 +0200
commit1e48ff42d281fb08b9d250ed2e3d5951992ad74c (patch)
tree2f7d0ca9431e1204028d139c56311519e6a78722
parent[RELEASE] flxutils-0.1.20 (diff)
downloadflxutils-1e48ff42d281fb08b9d250ed2e3d5951992ad74c.tar.gz
[RELEASE] flxutils-0.1.21v0.1.21
-rw-r--r--ChangeLog6
-rw-r--r--ifenslave/Makefile9
-rwxr-xr-xscripts/pkg6
3 files changed, 17 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 883dc3d..ab12e30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -37,3 +37,9 @@
2003/10/26
- fixes to pkg (0.3.17)
- release 0.1.20
+
+2003/11/11
+ - fixes to pkg (0.3.18) : compute dependencies even in /bin, /sbin & /lib
+ - fix compilation of ifenslave
+ - release 0.1.21
+
diff --git a/ifenslave/Makefile b/ifenslave/Makefile
index 116268d..40e94af 100644
--- a/ifenslave/Makefile
+++ b/ifenslave/Makefile
@@ -12,12 +12,19 @@ ifenslave:
rm -f ifenslave
ln -s ifenslave-1.0.12 ifenslave
-%: %.o
+ifenslave-1.0.11: ifenslave-1.0.11.o
$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
strip -R .comment -R .note $@
objdump -h $@ | grep -q '\.data[ ]*00000000' && strip -R .data $@ || true
# sstrip $@
+ifenslave-1.0.12: ifenslave-1.0.12.o
+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
+ strip -R .comment -R .note $@
+ objdump -h $@ | grep -q '\.data[ ]*00000000' && strip -R .data $@ || true
+ # sstrip $@
+
+
%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
diff --git a/scripts/pkg b/scripts/pkg
index 9889ed2..460b8f7 100755
--- a/scripts/pkg
+++ b/scripts/pkg
@@ -1,6 +1,6 @@
#!/bin/bash
-# pkg - Formilux package builder - version 0.3.17 - 2003-10-12
+# pkg - Formilux package builder - version 0.3.18 - 2003-11-11
#
# Copyright (C) 2001-2003 Benoit Dolez & Willy Tarreau
# mailto: benoit@ant-computing.com,willy@ant-computing.com
@@ -898,7 +898,7 @@ function _do_pack_files {
*/info/*.info|*/info/*.info-[0-9]*)
echo "$REPLY \$INFO" >> $DEP_FILE
;;
- */sbin/*|*/bin/*|*/lib/*|*/libexec/*)
+ bin/*|sbin/*|lib/*|*/sbin/*|*/bin/*|*/lib/*|*/libexec/*)
flr="$(file $REPLY)"
case "$flr" in
*\ shell\ *)
@@ -1046,7 +1046,7 @@ function do_pack {
fi
echo "$REPLY \$INFO" >> $DEP_FILE
;;
- */sbin/*|*/bin/*|*/lib/*|*/libexec/*)
+ bin/*|sbin/*|lib/*|*/sbin/*|*/bin/*|*/lib/*|*/libexec/*)
flr="$(file $REPLY)"
case "$flr" in
*\ shell\ *)