aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormitchell <70453897+667e-11@users.noreply.github.com>2019-11-07 14:29:11 -0500
committermitchell <70453897+667e-11@users.noreply.github.com>2019-11-07 14:29:11 -0500
commitc6f3d9a896f391cac9bb77c303b3e7a4084990c9 (patch)
tree8377c014102479fb6694241ffc1eaf82fd30b42c
parentd62646466f616b992029c92a3f6dd1ebac61d116 (diff)
downloadtextadept-c6f3d9a896f391cac9bb77c303b3e7a4084990c9.tar.gz
textadept-c6f3d9a896f391cac9bb77c303b3e7a4084990c9.zip
Simplified some Makefile rules.
-rw-r--r--src/Makefile8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/Makefile b/src/Makefile
index bc0f9fba..4d8e8e76 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -400,9 +400,9 @@ lua/src/lib/lpeg: | $(lpeg_tgz)
mkdir -p $@ && tar xzf $| -C $@ && mv $@/*/*.c $@/*/*.h $(dir $@)
lua/src/lib/lfs: | $(lfs_zip)
if [ -d $@ ]; then rm -r $@; fi
- mkdir -p $@ && unzip -d $@ $| && mv $@/*/src/*.c $@/*/src/*.h $(dir $@)
+ mkdir -p $@ && unzip -d $(dir $@) -j $| "*/src/*.c" "*/src/*.h"
$(gtdialog_zip): ; $(WGET) $(gtdialog_url)
-gtdialog: | $(gtdialog_zip) ; mkdir $@ && unzip -d $@ $| && mv $@/*/* $@
+gtdialog: | $(gtdialog_zip) ; unzip -d $@ -j $|
$(cdk_tgz): ; $(WGET) http://invisible-mirror.net/archives/cdk/$@
cdk: cdk.patch | $(cdk_tgz)
if [ -d $@ ]; then rm -r $@; fi
@@ -428,9 +428,7 @@ win32curses: | $(win32curses_zip) $(pdcurses_zip)
$(gtkosx_tgz): ; $(WGET) http://foicica.com/textadept/download/$@
gtkosx: | $(gtkosx_tgz) ; mkdir $@ && tar xzf $| -C $@ && mv $@/*/* $@
$(bombay_zip): ; $(WGET) http://foicica.com/hg/bombay/archive/tip.zip
-../doc/bombay: | $(bombay_zip)
- mkdir $(notdir $@) && unzip -d $(notdir $@) $| && \
- mv $(notdir $@)/*/* $(dir $@)
+../doc/bombay: | $(bombay_zip) ; unzip -d $(dir $@) -j $|
$(cloc): ; $(WGET) http://prdownloads.sourceforge.net/cloc/$@
sign-deps: | $(scintilla_tgz) $(lua_tgz) $(lpeg_tgz) $(lfs_zip) \
$(gtdialog_zip) $(cdk_tgz) $(termkey_tgz) $(win32gtk_zip) \