diff options
author | Micael Karlberg <[email protected]> | 2012-02-06 14:49:42 +0100 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2012-02-06 14:49:42 +0100 |
commit | dcf35c1ef914f7473bb64fa9175af2cf42744885 (patch) | |
tree | 04183491c784b1d9ff0e2fcdbf06f6bd2d22755e /lib/inets/src/inets_app | |
parent | 2d97f0e5f13bf22d92dbc6df18787581eb462c41 (diff) | |
parent | f555a1b1ed4461c33a99737136daf2793479425e (diff) | |
download | otp-dcf35c1ef914f7473bb64fa9175af2cf42744885.tar.gz otp-dcf35c1ef914f7473bb64fa9175af2cf42744885.tar.bz2 otp-dcf35c1ef914f7473bb64fa9175af2cf42744885.zip |
Merge branch 'bmk/inets/httpd/configurable_server_tokens/OTP-9805' into bmk/inets/inets59_integration
Diffstat (limited to 'lib/inets/src/inets_app')
-rw-r--r-- | lib/inets/src/inets_app/inets.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/inets/src/inets_app/inets.mk b/lib/inets/src/inets_app/inets.mk index 194b4ca2b1..d24cc0aea3 100644 --- a/lib/inets/src/inets_app/inets.mk +++ b/lib/inets/src/inets_app/inets.mk @@ -41,8 +41,6 @@ INETS_APP_VSN_COMPILE_FLAGS = \ +'{parse_transform,sys_pre_attributes}' \ +'{attribute,insert,app_vsn,$(APP_VSN)}' -INETS_FLAGS = -D'SERVER_SOFTWARE="$(APPLICATION)/$(VSN)"' - INETS_ERL_COMPILE_FLAGS += \ -pa $(ERL_TOP)/lib/inets/ebin \ $(INETS_APP_VSN_COMPILE_FLAGS) |