diff options
| author | lloyd <[email protected]> | 2006-09-09 14:26:55 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2006-09-09 14:26:55 +0000 |
| commit | c52bd1c8962deaab6c1c41f98abbf5a8b6c552c3 (patch) | |
| tree | 22d36a77c0c0e3947da8f40489648c914839b950 /misc | |
| parent | d59000d08c3814bde65e0234088c8a822364154b (diff) | |
Fix the clean and install targets in the makefiles
Clean up how help output is produced a bit further.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/config/makefile/nmake.in | 10 | ||||
| -rw-r--r-- | misc/config/makefile/unix.in | 6 | ||||
| -rw-r--r-- | misc/config/makefile/unix_shr.in | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/misc/config/makefile/nmake.in b/misc/config/makefile/nmake.in index 01d1fd07a..7e8dc7349 100644 --- a/misc/config/makefile/nmake.in +++ b/misc/config/makefile/nmake.in @@ -88,14 +88,14 @@ static: $(STATIC_LIB) # Fake Targets # ################################################## clean: - $(RM) @{var:build}\lib\* @{var:build}\checks\* + $(RM) @{var:build-dir}\lib\* @{var:build-dir}\checks\* $(RM) $(LIBRARIES) $(CHECK) distclean: clean - $(RM) @{var:build}\include\botan\* - $(RMDIR) @{var:build}\include\botan - $(RMDIR) @{var:build}\lib @{var:build}\checks @{var:build}\include - $(RMDIR) @{var:build} + $(RM) @{var:build-dir}\include\botan\* + $(RMDIR) @{var:build-dir}\include\botan @{var:build-dir}\include + $(RMDIR) @{var:build-dir}\lib @{var:build-dir}\checks + $(RMDIR) @{var:build-dir} $(RM) Makefile ################################################## diff --git a/misc/config/makefile/unix.in b/misc/config/makefile/unix.in index f5d83c81a..a4342da00 100644 --- a/misc/config/makefile/unix.in +++ b/misc/config/makefile/unix.in @@ -43,7 +43,7 @@ INSTALL_CMD_EXEC = @{var:install_cmd_exec} INSTALL_CMD_DATA = @{var:install_cmd_data} LN = ln -fs MKDIR = @mkdir -MKDIR_INSTALL = @umask 022; mkdir -p -m $(EXEC_MODE) +MKDIR_INSTALL = @umask 022; mkdir -p -m 755 RANLIB = @{var:ranlib_command} RM = @rm -f RM_R = @rm -rf @@ -97,11 +97,11 @@ $(STATIC_LIB): $(LIBOBJS) static: $(STATIC_LIB) clean: - $(RM_R) @{var:build}/lib/* @{var:build}/checks/* + $(RM_R) @{var:build-dir}/lib/* @{var:build-dir}/checks/* $(RM) $(LIBRARIES) $(SYMLINK) $(CHECK) distclean: clean - $(RM_R) @{var:build} + $(RM_R) @{var:build-dir} $(RM) Makefile $(CONFIG_SCRIPT) install: $(LIBRARIES) diff --git a/misc/config/makefile/unix_shr.in b/misc/config/makefile/unix_shr.in index 24a77707e..fc85f4ad3 100644 --- a/misc/config/makefile/unix_shr.in +++ b/misc/config/makefile/unix_shr.in @@ -45,7 +45,7 @@ INSTALL_CMD_EXEC = @{var:install_cmd_exec} INSTALL_CMD_DATA = @{var:install_cmd_data} LN = ln -fs MKDIR = @mkdir -MKDIR_INSTALL = @umask 022; mkdir -p -m $(EXEC_MODE) +MKDIR_INSTALL = @umask 022; mkdir -p -m 755 RANLIB = @{var:ranlib_command} RM = @rm -f RM_R = @rm -rf @@ -110,11 +110,11 @@ static: $(STATIC_LIB) shared: $(SHARED_LIB) clean: - $(RM_R) @{var:build}/lib/* @{var:build}/checks/* + $(RM_R) @{var:build-dir}/lib/* @{var:build-dir}/checks/* $(RM) $(LIBRARIES) $(SYMLINK) $(CHECK) distclean: clean - $(RM_R) @{var:build} + $(RM_R) @{var:build-dir} $(RM) Makefile $(CONFIG_SCRIPT) install: $(LIBRARIES) |