diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2015-04-26 10:57:24 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2015-04-26 10:57:24 -0700 |
| commit | e982e57fc3b4348bb601a8764ce2d17f0dc053ae (patch) | |
| tree | 0de59aeceac4e68075622088bd3d5c95cc82cdcd /Makefile.nmake | |
| parent | 835d63b63c920e972b4e72418dea0dd08c667bde (diff) | |
Makefile.nmake fixes.
Removed echo, pushd, popd.
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 3f604e4..b0556e2 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -7,21 +7,20 @@ PROG=$(BUILDDIR)\src\cmark.exe GENERATOR=NMake Makefiles
all: $(BUILDDIR)
- @pushd $(BUILDDIR) && $(MAKE) /nologo && popd
+ @cd $(BUILDDIR) && $(MAKE) /nologo && cd ..
$(BUILDDIR):
- @cmake --version > nul || (echo "You need cmake to build this program: http://www.cmake.org/download/" && exit 1)
- -mkdir $(BUILDDIR) 2> nul
- pushd $(BUILDDIR) && \
+ @-mkdir $(BUILDDIR) 2> nul
+ cd $(BUILDDIR) && \
cmake \
-G "$(GENERATOR)" \
-D CMAKE_BUILD_TYPE=$(BUILD_TYPE) \
-D CMAKE_INSTALL_PREFIX=$(INSTALLDIR) \
.. && \
- popd
+ cd ..
install: all
- @pushd $(BUILDDIR) && $(MAKE) /nologo install && popd
+ @cd $(BUILDDIR) && $(MAKE) /nologo install && cd ..
clean:
-rmdir /s /q $(BUILDDIR) $(MINGW_INSTALLDIR) 2> nul
@@ -30,7 +29,7 @@ $(SRCDIR)\case_fold_switch.inc: $(DATADIR)\CaseFolding-3.2.0.txt perl mkcasefold.pl < $? > $@
test: $(SPEC) all
- @pushd $(BUILDDIR) && $(MAKE) /nologo test ARGS="-V" && popd
+ @cd $(BUILDDIR) && $(MAKE) /nologo test ARGS="-V" && cd ..
distclean: clean
del /q src\scanners.c 2> nul
|