diff options
author | John Högberg <[email protected]> | 2017-07-06 12:33:39 +0200 |
---|---|---|
committer | John Högberg <[email protected]> | 2017-07-06 12:33:39 +0200 |
commit | 1f1d20a352d16741c272f14dd7d09632eef13509 (patch) | |
tree | eab34f895460ee92a3ebcbf6e2d813e1384e65e0 /erts/etc/common/Makefile.in | |
parent | af4f81a46d895c8a217c104c874a912073728374 (diff) | |
parent | 5a537ae41c2295f7f19e4e01fe90acc7585f5b30 (diff) | |
download | otp-1f1d20a352d16741c272f14dd7d09632eef13509.tar.gz otp-1f1d20a352d16741c272f14dd7d09632eef13509.tar.bz2 otp-1f1d20a352d16741c272f14dd7d09632eef13509.zip |
Merge branch 'maint'
Diffstat (limited to 'erts/etc/common/Makefile.in')
-rw-r--r-- | erts/etc/common/Makefile.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in index 583426460e..4bcbb288b3 100644 --- a/erts/etc/common/Makefile.in +++ b/erts/etc/common/Makefile.in @@ -57,7 +57,7 @@ ERTS_INCL = -I$(ERL_TOP)/erts/include \ CC = @CC@ WFLAGS = @WFLAGS@ CFLAGS = @CFLAGS@ @DEFS@ $(TYPE_FLAGS) @WFLAGS@ -I$(SYSDIR) -I$(EMUDIR) \ - $(ERTS_INCL) -DOTP_SYSTEM_VERSION=\"$(SYSTEM_VSN)\" + -I$(COMSYSDIR) $(ERTS_INCL) -DOTP_SYSTEM_VERSION=\"$(SYSTEM_VSN)\" LD = @LD@ LIBS = @LIBS@ LDFLAGS = @LDFLAGS@ @@ -77,6 +77,7 @@ endif BINDIR = $(ERL_TOP)/bin/$(TARGET) OBJDIR = $(ERL_TOP)/erts/obj$(TYPEMARKER)/$(TARGET) EMUDIR = $(ERL_TOP)/erts/emulator/beam +COMSYSDIR = $(ERL_TOP)/erts/emulator/sys/common EMUOSDIR = $(ERL_TOP)/erts/emulator/@ERLANG_OSTYPE@ SYSDIR = $(ERL_TOP)/erts/emulator/sys/@ERLANG_OSTYPE@ DRVDIR = $(ERL_TOP)/erts/emulator/drivers/@ERLANG_OSTYPE@ |