| 1 |
ottxor |
1.1 |
Index: sh.h
|
| 2 |
|
|
===================================================================
|
| 3 |
|
|
RCS file: /cvs/src/bin/mksh/sh.h,v
|
| 4 |
|
|
retrieving revision 1.579
|
| 5 |
|
|
retrieving revision 1.580
|
| 6 |
|
|
diff -u -r1.579 -r1.580
|
| 7 |
|
|
--- sh.h 24 Aug 2012 19:03:21 -0000 1.579
|
| 8 |
|
|
+++ sh.h 24 Aug 2012 19:09:34 -0000 1.580
|
| 9 |
|
|
@@ -959,15 +959,16 @@
|
| 10 |
|
|
|
| 11 |
|
|
/* Determine the location of the system (common) profile */
|
| 12 |
|
|
|
| 13 |
|
|
-/* This is deliberately not configurable via CPPFLAGS */
|
| 14 |
|
|
+#ifndef MKSH_DEFAULT_PROFILEDIR
|
| 15 |
|
|
#if defined(ANDROID)
|
| 16 |
|
|
-#define MKSH_ETC_LOCATION "/system/etc"
|
| 17 |
|
|
+#define MKSH_DEFAULT_PROFILEDIR "/system/etc"
|
| 18 |
|
|
#else
|
| 19 |
|
|
-#define MKSH_ETC_LOCATION "/etc"
|
| 20 |
|
|
+#define MKSH_DEFAULT_PROFILEDIR "/etc"
|
| 21 |
|
|
+#endif
|
| 22 |
|
|
#endif
|
| 23 |
|
|
|
| 24 |
|
|
-#define MKSH_SYSTEM_PROFILE MKSH_ETC_LOCATION "/profile"
|
| 25 |
|
|
-#define MKSH_SUID_PROFILE MKSH_ETC_LOCATION "/suid_profile"
|
| 26 |
|
|
+#define MKSH_SYSTEM_PROFILE MKSH_DEFAULT_PROFILEDIR "/profile"
|
| 27 |
|
|
+#define MKSH_SUID_PROFILE MKSH_DEFAULT_PROFILEDIR "/suid_profile"
|
| 28 |
|
|
|
| 29 |
|
|
|
| 30 |
|
|
/* Used by v_evaluate() and setstr() to control action when error occurs */
|