diff options
author | lloyd <lloyd@randombit.net> | 2009-07-01 22:01:56 +0000 |
---|---|---|
committer | lloyd <lloyd@randombit.net> | 2009-07-01 22:01:56 +0000 |
commit | f9d40f1512aa19128a4d2f06839d5eeb5f4d931f (patch) | |
tree | d15209051176bd1a5a485f1e7144c2c9ab3fd144 | |
parent | 7d4f0f6e08e9752480c86ab047590ec8e35dc3b7 (diff) | |
parent | e3ca26266c2f5a684bbac6258603aaa10133c46a (diff) |
propagate from branch 'net.randombit.botan' (head b78675e3dd229ba7d4c9474d02a78ed503ec2c72)
to branch 'net.randombit.botan.python-configure' (head a1cf4db57e9200760d997210d38cbf274dab4a2f)
-rw-r--r-- | src/build-data/makefile/nmake.in | 12 | ||||
-rw-r--r-- | src/build-data/makefile/unix.in | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in index b1e651551..fb9ab1542 100644 --- a/src/build-data/makefile/nmake.in +++ b/src/build-data/makefile/nmake.in @@ -93,15 +93,15 @@ static: $(STATIC_LIB) # Fake Targets # ################################################## clean: - $(RM) %{build-dir}\lib\* %{build-dir}\checks\* + $(RM) %{build_dir}\lib\* %{build_dir}\checks\* $(RM) $(LIBRARIES) $(CHECK) distclean: clean - $(RM) %{build-dir}\build.h - $(RM) %{build-dir}\include\botan\* - $(RMDIR) %{build-dir}\include\botan %{build-dir}\include - $(RMDIR) %{build-dir}\lib %{build-dir}\checks - $(RMDIR) %{build-dir} + $(RM) %{build_dir}\build.h + $(RM) %{build_dir}\include\botan\* + $(RMDIR) %{build_dir}\include\botan %{build_dir}\include + $(RMDIR) %{build_dir}\lib %{build_dir}\checks + $(RMDIR) %{build_dir} $(RM) Makefile ################################################## diff --git a/src/build-data/makefile/unix.in b/src/build-data/makefile/unix.in index 95859d16d..a48a5a17e 100644 --- a/src/build-data/makefile/unix.in +++ b/src/build-data/makefile/unix.in @@ -95,11 +95,11 @@ doxygen: doxygen %{doc_src_dir}/botan.doxy clean: - $(RM_R) %{build-dir}/lib/* %{build-dir}/checks/* + $(RM_R) %{build_dir}/lib/* %{build_dir}/checks/* $(RM) $(LIBRARIES) $(SYMLINK) $(CHECK) distclean: clean - $(RM_R) %{build-dir} + $(RM_R) %{build_dir} $(RM_R) %{doc_src_dir}/doxygen %{doc_src_dir}/botan.doxy $(RM) Makefile $(CONFIG_SCRIPT) $(PKGCONFIG) |