Skip to content

Commit 22c60a7

Browse files
Make Makefile portable
"export" is unix-specific and doesn't work on Windows. Refs #12
1 parent 711178f commit 22c60a7

File tree

1 file changed

+10
-16
lines changed

1 file changed

+10
-16
lines changed

Makefile

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -77,42 +77,37 @@ clean-elc :
7777

7878
# Testing
7979

80-
test unit-test :
81-
HOME=$(tmp_d) ;\
80+
fake-home: export HOME=$(tmp_d)
81+
82+
test unit-test fake-home:
8283
$(emacs) $(load_files) --batch -f run-fsharp-unit-tests
8384

84-
integration-test : $(ac_exe) packages
85-
HOME=$(tmp_d) ;\
85+
integration-test : $(ac_exe) packages fake-home
8686
$(emacs) $(load_files) --batch -f run-fsharp-integration-tests
8787

8888
test-all : unit-test integration-test check-compile check-declares
8989

90-
packages :
91-
HOME=$(tmp_d) ;\
90+
packages : fake-home
9291
$(emacs) $(load_files) --batch -f load-packages
9392

94-
byte-compile : packages
95-
HOME=$(tmp_d) ;\
93+
byte-compile : packages fake-home
9694
$(emacs) -batch --eval "(package-initialize)"\
9795
--eval "(add-to-list 'load-path \"$(base_d)\")" \
9896
-f batch-byte-compile $(src_files)
9997

100-
check-declares : packages
101-
HOME=$(tmp_d) ;\
98+
check-declares : packages fake-home
10299
$(emacs) -batch --eval "(package-initialize)"\
103100
--eval "(dolist (file '($(foreach var,$(src_files),\"$(var)\"))) (when (check-declare-file file) (kill-emacs 1)))"
104101

105102
check-compile : packages $(obj_files)
106103

107104
faceup : $(faceup_outputs)
108105

109-
%.faceup : % fsharp-mode-font.el
110-
HOME=$(tmp_d) ;\
106+
%.faceup : % fsharp-mode-font.el fake-home
111107
$(emacs) $(load_files) -batch \
112108
--eval "(regen-faceup-output \"$<\")"
113109

114-
.el.elc:
115-
HOME=$(tmp_d) ;\
110+
.el.elc: fake-home
116111
$(emacs) -batch --eval "(package-initialize)"\
117112
--eval "(add-to-list 'load-path \"$(base_d)\")" \
118113
--eval '(setq byte-compile-error-on-warn t)' \
@@ -122,8 +117,7 @@ faceup : $(faceup_outputs)
122117
'find-tag-marker-ring))" \
123118
-f batch-byte-compile $<
124119

125-
run : $(ac_exe) packages
126-
HOME=$(tmp_d) ;\
120+
run : $(ac_exe) packages fake-home
127121
$(emacs) $(load_files) -f configure-fsharp-tests
128122

129123
# Releasing

0 commit comments

Comments
 (0)