projects
/
autodist.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ae8e817
)
updates.
author
Pekka Riikonen
<priikone@silcnet.org>
Fri, 22 Apr 2005 00:14:57 +0000
(
00:14
+0000)
committer
Pekka Riikonen
<priikone@silcnet.org>
Fri, 22 Apr 2005 00:14:57 +0000
(
00:14
+0000)
apps/autodist/autodist.in
patch
|
blob
|
history
diff --git
a/apps/autodist/autodist.in
b/apps/autodist/autodist.in
index 700ae8f001bb7b03b0f373c124100505940d90da..b16f696bf61307b3fd041dc9744bbbdd2a6ebeea 100755
(executable)
--- a/
apps/autodist/autodist.in
+++ b/
apps/autodist/autodist.in
@@
-826,11
+826,11
@@
ad_makedist()
fi
# Parse the requested distribution
fi
# Parse the requested distribution
- distribution=`cat autodist.dist | grep "dist:" | cut -d: -f2`
- dist_version=`cat autodist.dist | grep "ver:" | cut -d: -f2`
+ distribution=`cat autodist.dist | grep "dist:" | cut -d: -f2` || exit 1
+ dist_version=`cat autodist.dist | grep "ver:" | cut -d: -f2` || exit 1
+ am_distdir=`cat autodist.dist | grep "distdir:" | cut -d: -f2` || exit 1
ad_parse_distribution $distribution false
ad_process_distdefs
ad_parse_distribution $distribution false
ad_process_distdefs
- am_distdir="$package-$dist_version"
if test x$opt_no_dist = xtrue; then
ad_fatal "The '$distribution' distribution cannot be packaged"
if test x$opt_no_dist = xtrue; then
ad_fatal "The '$distribution' distribution cannot be packaged"
@@
-1676,7
+1676,7
@@
ad_make_makefile_ins
ad_debug "Creating autodist.dist"
echo "dist:$distfile" > autodist.dist
echo "ver:$dist_version" >> autodist.dist
ad_debug "Creating autodist.dist"
echo "dist:$distfile" > autodist.dist
echo "ver:$dist_version" >> autodist.dist
-echo "$package-$dist_version" >> autodist.dist
+echo "
distdir:
$package-$dist_version" >> autodist.dist
#
# Run post-hooks
#
# Run post-hooks