merge: fix Evil standard headers installation

SVN revision: 79194

diff --git a/src/Makefile_Evil.am b/src/Makefile_Evil.am
index 4eb8b566164f6a6f8b6255bb89a5cfff4f9b64db..d4bac9cd3ae5856fd9d10e8ecae80580bf841e1c 100644 (file)
--- a/src/Makefile_Evil.am
+++ b/src/Makefile_Evil.am
@@ -19,20 +19,20 @@ lib/evil/evil_stdio.h \
 lib/evil/evil_string.h \
 lib/evil/evil_time.h \
 lib/evil/evil_unistd.h \
-lib/evil/evil_util.h
-
-evilstdheadersdir = $(includedir)/evil-@VMAJ@
-nobase_dist_evilstdheaders_DATA = \
+lib/evil/evil_util.h \
 lib/evil/pwd.h \
-lib/evil/sys/mman.h \
 lib/evil/fnmatch.h \
 lib/evil/dirent.h \
 lib/evil/dlfcn.h
 
 if HAVE_WINCE
-nobase_dist_evilstdheaders_DATA += lib/evil/mingw32ce/errno.h
+dist_install_evilheaders_DATA += lib/evil/mingw32ce/errno.h
 endif
 
+evilmmanheadersdir = $(includedir)/evil-@VMAJ@/sys
+nobase_dist_evilmmanheaders_DATA = \
+lib/evil/sys/mman.h
+
 # gdtoa
 lib_evil_libevil_la_SOURCES = \
 lib/evil/gdtoa/arithchk.c \