Просмотр исходного кода

Merge pull request #314 from Troglodyne-Internet-Widgets/tired_of_this_makefile_overwrite

Just move the makefile, update readme to use -f
George S. Baugh 2 лет назад
Родитель
Сommit
b7bcc0d953
3 измененных файлов с 5 добавлено и 6 удалено
  1. 1 0
      .gitignore
  2. 2 2
      Installer.mk
  3. 2 4
      Readme.md

+ 1 - 0
.gitignore

@@ -19,6 +19,7 @@ config/auth.db
 config/has_users
 config/main.cfg
 config/setup
+Makefile
 MYMETA.yml
 MYMETA.json
 node_modules/

+ 2 - 2
Makefile → Installer.mk

@@ -2,8 +2,8 @@ SHELL := /bin/bash
 
 .PHONY: depend
 depend:
-	[ -f "/etc/debian_version" ] && make prereq-debs; /bin/true;
-	make prereq-perl prereq-frontend
+	[ -f "/etc/debian_version" ] && make -f Installer.mk prereq-debs; /bin/true;
+	make -f Installer.mk prereq-perl prereq-frontend
 
 .PHONY: install
 install:

+ 2 - 4
Readme.md

@@ -4,8 +4,8 @@ tCMS
 A flexible perl CMS which supports multiple data models and content types
 
 Deployment is currently:
-* make depend
-* make install
+* make -f Installer.mk depend
+* make -f Installer.mk install
 
 Then:
 * Set up proxy rule in your webserver
@@ -16,8 +16,6 @@ OR (if you want tCMS as a systemd service for the current user):
 
 $PORT being whatever port you want it to sit on.
 
-TODO: Make the makefile not rewrite itself when running make! Reset for now after run.
-
 A Dockerfile and deployment scripts are provided for your convenience in building/running containers based on this:
 ```
 # Build and run the server