diff options
| author | Ingela Anderton Andin <[email protected]> | 2010-12-01 10:24:51 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2010-12-01 10:24:51 +0100 |
| commit | 7369151bc24d9d3b0b1ebed19a1a7d0df9101a81 (patch) | |
| tree | b34ce11c1aa8ee57d363983d1f8d382ea3a7b64a /lib/inets/src/http_server/Makefile | |
| parent | d9a508b6ca18ce3bf76563c89bf452e74fa65d45 (diff) | |
| parent | f05d42599f3c8fa3632ca04c21a5f91100275feb (diff) | |
| download | otp-7369151bc24d9d3b0b1ebed19a1a7d0df9101a81.tar.gz otp-7369151bc24d9d3b0b1ebed19a1a7d0df9101a81.tar.bz2 otp-7369151bc24d9d3b0b1ebed19a1a7d0df9101a81.zip | |
Merge branch 'ia/inets/url-encoding/OTP-8940' into dev
* ia/inets/url-encoding/OTP-8940:
Changed file error handling to be consistent
URL-encoding - add support in client and more usage in server. Also added missing include directory.
Diffstat (limited to 'lib/inets/src/http_server/Makefile')
| -rw-r--r-- | lib/inets/src/http_server/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/inets/src/http_server/Makefile b/lib/inets/src/http_server/Makefile index 879e605217..bdd8c5ee3c 100644 --- a/lib/inets/src/http_server/Makefile +++ b/lib/inets/src/http_server/Makefile @@ -82,7 +82,9 @@ MODULES = \ mod_security \ mod_security_server -HRL_FILES = httpd.hrl httpd_internal.hrl mod_auth.hrl +INCLUDE = ../../include + +HRL_FILES = $(INCLUDE)/httpd.hrl httpd_internal.hrl mod_auth.hrl ERL_FILES = $(MODULES:%=%.erl) @@ -98,9 +100,9 @@ include ../inets_app/inets.mk ERL_COMPILE_FLAGS += \ $(INETS_FLAGS) \ $(INETS_ERL_COMPILE_FLAGS) \ - -I../../include \ + -I$(INCLUDE) \ -I../inets_app \ - -I../http_lib + -I../http_lib \ # ---------------------------------------------------- |