From 4f32c76fb1e4a3da510e19dce3a8e8f249cc63fe Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Thu, 31 Mar 2005 19:02:44 +0000 Subject: [PATCH] Apache.exe -> httpd.exe - per discussion on dev@httpd to make Win32 consistent with Unix, and as importantly, quitclaim the 'Apache HTTP Server' project's claim on something not in the spirit of the greater Foundation. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@159626 13f79535-47bb-0310-9956-ffa450edef68 --- Apache.dsw | 4 ++-- Makefile.win | 6 +++--- Apache.dsp => httpd.dsp | 0 3 files changed, 5 insertions(+), 5 deletions(-) rename Apache.dsp => httpd.dsp (100%) diff --git a/Apache.dsw b/Apache.dsw index 39d1daeae3e..ef114183794 100644 --- a/Apache.dsw +++ b/Apache.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ############################################################################### -Project: "Apache"=.\Apache.dsp - Package Owner=<4> +Project: "httpd"=".\httpd.dsp" - Package Owner=<4> Package=<5> {{{ @@ -51,7 +51,7 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name Apache + Project_Dep_Name httpd End Project Dependency Begin Project Dependency Project_Dep_Name ApacheMonitor diff --git a/Makefile.win b/Makefile.win index 29402748c02..582e4e27831 100644 --- a/Makefile.win +++ b/Makefile.win @@ -160,7 +160,7 @@ clean: _cleanr _cleand y << -!IF EXIST("Apache.mak") +!IF EXIST("httpd.mak") _cleanr: $(MAKE) $(MAKEOPT) -f Makefile.win SHORT=R LONG=Release CTARGET=CLEAN _build @@ -207,7 +207,7 @@ _build: $(MAKE) $(MAKEOPT) -f gen_test_char.mak CFG="gen_test_char - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd .. $(MAKE) $(MAKEOPT) -f libhttpd.mak CFG="libhttpd - Win32 $(LONG)" RECURSE=0 $(CTARGET) - $(MAKE) $(MAKEOPT) -f Apache.mak CFG="Apache - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f httpd.mak CFG="httpd - Win32 $(LONG)" RECURSE=0 $(CTARGET) # build ldap prior to authnz_ldap cd modules\ldap $(MAKE) $(MAKEOPT) -f mod_ldap.mak CFG="mod_ldap - Win32 $(LONG)" RECURSE=0 $(CTARGET) @@ -373,7 +373,7 @@ _build: _copybin: - copy $(LONG)\Apache.$(src_exe) "$(inst_exe)" <.y + copy $(LONG)\httpd.$(src_exe) "$(inst_exe)" <.y copy $(LONG)\libhttpd.$(src_dll) "$(inst_dll)" <.y copy srclib\apr\$(LONG)\libapr-1.$(src_dll) "$(inst_dll)" <.y copy srclib\apr-iconv\$(LONG)\libapriconv-1.$(src_dll) "$(inst_dll)" <.y diff --git a/Apache.dsp b/httpd.dsp similarity index 100% rename from Apache.dsp rename to httpd.dsp -- 2.47.2