tools: makefile updates
This commit is contained in:
		
							parent
							
								
									e12e8c0c0f
								
							
						
					
					
						commit
						f595c2ceed
					
				
							
								
								
									
										14
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										14
									
								
								Makefile
									
									
									
									
									
								
							| @ -116,12 +116,13 @@ default: tag bin/hledger | |||||||
| 
 | 
 | ||||||
| # cabal install all hledger PACKAGES and dependencies in the proper order
 | # cabal install all hledger PACKAGES and dependencies in the proper order
 | ||||||
| # (or, as many as possible)
 | # (or, as many as possible)
 | ||||||
|  | EXTRAINSTALLARGS= | ||||||
| install: | install: | ||||||
| 	cabal install $(patsubst %,./%,$(PACKAGES)) | 	cabal install $(patsubst %,./%,$(PACKAGES)) $(EXTRAINSTALLARGS) | ||||||
| 
 | 
 | ||||||
| # # run a cabal command in all hledger package dirs
 | # run a cabal command in all hledger package dirs
 | ||||||
| # allcabal%:
 | allcabal%: | ||||||
| # 	for p in $(PACKAGES); do (echo doing cabal $* in $$p; cd $$p; cabal $*; echo); done
 | 	for p in $(PACKAGES); do (echo doing cabal $* in $$p; cd $$p; cabal $*; echo); done | ||||||
| 
 | 
 | ||||||
| # # run a command in all hledger package dirs
 | # # run a command in all hledger package dirs
 | ||||||
| # all%:
 | # all%:
 | ||||||
| @ -135,7 +136,7 @@ auto: sp | |||||||
| 
 | 
 | ||||||
| autoweb: sp | autoweb: sp | ||||||
| 	rm -f bin/hledger-web | 	rm -f bin/hledger-web | ||||||
| 	cd hledger-web; $(AUTOBUILD) hledger-web.hs -o ../bin/hledger-web $(BUILDFLAGS) -DPRODUCTION=1 --run -B --port 5001 --base-url http://demo.hledger.org:5001 -f test.journal | 	cd hledger-web; $(AUTOBUILD) hledger-web.hs -o ../bin/hledger-web $(BUILDFLAGS) --run -B --port 5001 --base-url http://demo.hledger.org:5001 -f test.journal | ||||||
| 
 | 
 | ||||||
| autovty: sp | autovty: sp | ||||||
| 	rm -f bin/hledger-vty | 	rm -f bin/hledger-vty | ||||||
| @ -730,9 +731,6 @@ setversion: $(VERSIONSENSITIVEFILES) | |||||||
| Setversion: | Setversion: | ||||||
| 	touch $(VERSIONFILE); make setversion | 	touch $(VERSIONFILE); make setversion | ||||||
| 
 | 
 | ||||||
| hledger/Hledger/Cli/Version.hs: $(VERSIONFILE) |  | ||||||
| 	perl -p -e "s/(^version *= *)\".*?\"/\1\"$(VERSION3)\"/" -i $@ |  | ||||||
| 
 |  | ||||||
| hledger-lib/hledger-lib.cabal: $(VERSIONFILE) | hledger-lib/hledger-lib.cabal: $(VERSIONFILE) | ||||||
| 	perl -p -e "s/(^ *version:) *.*/\1 $(VERSION)/" -i $@ | 	perl -p -e "s/(^ *version:) *.*/\1 $(VERSION)/" -i $@ | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user