merge 3.5

This commit is contained in:
Benjamin Peterson 2016-06-02 12:42:40 -07:00
commit 59ae8ec75f
1 changed files with 2 additions and 19 deletions

View File

@ -101,25 +101,8 @@
#endif #endif
#ifndef VERSION #if !defined(PREFIX) || !defined(EXEC_PREFIX) || !defined(VERSION) || !defined(VPATH)
#define VERSION "2.1" #error "PREFIX, EXEC_PREFIX, VERSION, and VPATH must be constant defined"
#endif
#ifndef VPATH
#define VPATH "."
#endif
#ifndef PREFIX
# define PREFIX "/usr/local"
#endif
#ifndef EXEC_PREFIX
#define EXEC_PREFIX PREFIX
#endif
#ifndef PYTHONPATH
#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
#endif #endif
#ifndef LANDMARK #ifndef LANDMARK