[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 1fa1354: Remove relative paths for consistency
From: |
Phillip Lord |
Subject: |
master 1fa1354: Remove relative paths for consistency |
Date: |
Sun, 3 Jan 2021 16:05:59 -0500 (EST) |
branch: master
commit 1fa1354964aa3a0e5e649df6c963b6c11333a350
Author: Phillip Lord <phillip.lord@russet.org.uk>
Commit: Phillip Lord <phillip.lord@russet.org.uk>
Remove relative paths for consistency
* admin/nt/dist-build/build-zips.sh: Remove Paths
---
admin/nt/dist-build/build-zips.sh | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/admin/nt/dist-build/build-zips.sh
b/admin/nt/dist-build/build-zips.sh
index 809cbc6..4a9a7b5 100755
--- a/admin/nt/dist-build/build-zips.sh
+++ b/admin/nt/dist-build/build-zips.sh
@@ -20,7 +20,7 @@
function git_up {
echo [build] Making git worktree for Emacs $VERSION
- cd $HOME/emacs-build/git/emacs-$MAJOR_VERSION
+ cd $REPO_DIR/emacs-$MAJOR_VERSION
git pull
git worktree add ../$BRANCH $BRANCH
@@ -54,7 +54,7 @@ function build_zip {
if [ ! -f Makefile ] || (($CONFIG))
then
echo [build] Configuring Emacs $ARCH
- ../../../git/$BRANCH/configure \
+ $REPO_DIR/$BRANCH/configure \
--without-dbus \
--host=$HOST --without-compress-install \
$CACHE \
@@ -88,7 +88,7 @@ function build_installer {
ARCH=$1
cd $HOME/emacs-build/install/emacs-$VERSION
echo [build] Calling makensis in `pwd`
- cp ../../git/$BRANCH/admin/nt/dist-build/emacs.nsi .
+ cp $REPO_DIR/$BRANCH/admin/nt/dist-build/emacs.nsi .
makensis -v4 \
-DARCH=$ARCH -DEMACS_VERSION=$ACTUAL_VERSION \
@@ -110,6 +110,10 @@ CONFIG=1
CFLAGS="-O2 -static"
INSTALL_TARGET="install-strip"
+## The location of the git repo
+REPO_DIR=$HOME/emacs-build/git/
+
+
while getopts "36gb:hnsiV:" opt; do
case $opt in
3)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 1fa1354: Remove relative paths for consistency,
Phillip Lord <=