Fossil SCM

Enable make install without first calling make workflow by adjusting the install target prerequisites. This allows make install to be called on a fresh clone/checkout of Fossil because otherwise OBJDIR is missing and make install fails.

andybradford 2019-03-02 18:18 trunk
Commit 904eb8a5ec78a152c9b26c332c28a7a894fae2f02c92cf7868793125f09b1347
2 files changed +1 -1 +1 -1
+1 -1
--- src/main.mk
+++ src/main.mk
@@ -509,11 +509,11 @@
509509
510510
511511
512512
all: $(OBJDIR) $(APPNAME)
513513
514
-install: $(APPNAME)
514
+install: all
515515
mkdir -p $(INSTALLDIR)
516516
cp $(APPNAME) $(INSTALLDIR)
517517
518518
codecheck: $(TRANS_SRC) $(OBJDIR)/codecheck1
519519
$(OBJDIR)/codecheck1 $(TRANS_SRC)
520520
--- src/main.mk
+++ src/main.mk
@@ -509,11 +509,11 @@
509
510
511
512 all: $(OBJDIR) $(APPNAME)
513
514 install: $(APPNAME)
515 mkdir -p $(INSTALLDIR)
516 cp $(APPNAME) $(INSTALLDIR)
517
518 codecheck: $(TRANS_SRC) $(OBJDIR)/codecheck1
519 $(OBJDIR)/codecheck1 $(TRANS_SRC)
520
--- src/main.mk
+++ src/main.mk
@@ -509,11 +509,11 @@
509
510
511
512 all: $(OBJDIR) $(APPNAME)
513
514 install: all
515 mkdir -p $(INSTALLDIR)
516 cp $(APPNAME) $(INSTALLDIR)
517
518 codecheck: $(TRANS_SRC) $(OBJDIR)/codecheck1
519 $(OBJDIR)/codecheck1 $(TRANS_SRC)
520
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -318,11 +318,11 @@
318318
<<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS " \\\n "] \
319319
<<<SHELL_OPTIONS>>> [join $SHELL_OPTIONS " \\\n "] \
320320
<<<MINIZ_OPTIONS>>> [join $MINIZ_OPTIONS " \\\n "]] {
321321
all: $(OBJDIR) $(APPNAME)
322322
323
-install: $(APPNAME)
323
+install: all
324324
mkdir -p $(INSTALLDIR)
325325
cp $(APPNAME) $(INSTALLDIR)
326326
327327
codecheck: $(TRANS_SRC) $(OBJDIR)/codecheck1
328328
$(OBJDIR)/codecheck1 $(TRANS_SRC)
329329
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -318,11 +318,11 @@
318 <<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS " \\\n "] \
319 <<<SHELL_OPTIONS>>> [join $SHELL_OPTIONS " \\\n "] \
320 <<<MINIZ_OPTIONS>>> [join $MINIZ_OPTIONS " \\\n "]] {
321 all: $(OBJDIR) $(APPNAME)
322
323 install: $(APPNAME)
324 mkdir -p $(INSTALLDIR)
325 cp $(APPNAME) $(INSTALLDIR)
326
327 codecheck: $(TRANS_SRC) $(OBJDIR)/codecheck1
328 $(OBJDIR)/codecheck1 $(TRANS_SRC)
329
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -318,11 +318,11 @@
318 <<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS " \\\n "] \
319 <<<SHELL_OPTIONS>>> [join $SHELL_OPTIONS " \\\n "] \
320 <<<MINIZ_OPTIONS>>> [join $MINIZ_OPTIONS " \\\n "]] {
321 all: $(OBJDIR) $(APPNAME)
322
323 install: all
324 mkdir -p $(INSTALLDIR)
325 cp $(APPNAME) $(INSTALLDIR)
326
327 codecheck: $(TRANS_SRC) $(OBJDIR)/codecheck1
328 $(OBJDIR)/codecheck1 $(TRANS_SRC)
329

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button