Changeset 23656
- Timestamp:
- 10/21/09 09:41:23 (11 months ago)
- Files:
-
- trunk/midgard/core/midgard/Makefile.am (modified) (1 diff)
- trunk/midgard/core/midgard/configure.in (modified) (2 diffs)
- trunk/midgard/core/midgard/midgard2.pc.in (moved) (moved from trunk/midgard/core/midgard/midgard-2.0.pc.in) (1 prop)
- trunk/midgard/core/midgard/src/midgard_config_auto.h.in (modified) (2 diffs)
- trunk/midgard/core/midgard/src/midgard_defs.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/midgard/core/midgard/Makefile.am
r23464 r23656 174 174 src/midgard_view.c 175 175 176 pkgdatadir = $(datadir)/midgard -2.0177 pkglibdir = $(libdir)/midgard -2.0178 libmidgardincludedir = $(includedir)/midgard -2.0/midgard176 pkgdatadir = $(datadir)/midgard2 177 pkglibdir = $(libdir)/midgard2 178 libmidgardincludedir = $(includedir)/midgard2/midgard 179 179 libmidgardinclude_HEADERS = $(midgard_public_h) 180 180 181 mgdschemasdir = $(datadir)/midgard -2.0/schema181 mgdschemasdir = $(datadir)/midgard2/schema 182 182 183 183 pkgconfigdir = $(libdir)/pkgconfig 184 pkgconfig_DATA = midgard -2.0.pc184 pkgconfig_DATA = midgard2.pc 185 185 186 186 doc: trunk/midgard/core/midgard/configure.in
r22815 r23656 103 103 104 104 if test "$prefix" = "/usr"; then 105 sysconfdir="/etc/midgard -2.0"105 sysconfdir="/etc/midgard2" 106 106 elif test "$prefix" = "NONE"; then 107 sysconfdir="/usr/local/etc/midgard -2.0"107 sysconfdir="/usr/local/etc/midgard2" 108 108 else 109 sysconfdir="$prefix/etc/midgard -2.0"109 sysconfdir="$prefix/etc/midgard2" 110 110 fi 111 111 … … 122 122 AC_SUBST(DBUS_CONF_DIR) 123 123 124 AC_CONFIG_FILES([Makefile Doxyfile src/midgard_config_auto.h midgard -2.0.pc])124 AC_CONFIG_FILES([Makefile Doxyfile src/midgard_config_auto.h midgard2.pc]) 125 125 AC_OUTPUT trunk/midgard/core/midgard/midgard2.pc.in
- Property svn:mergeinfo set
trunk/midgard/core/midgard/src/midgard_config_auto.h.in
r19154 r23656 1 1 2 2 #define MIDGARD_LIB_PREFIX "@prefix@" 3 #define MIDGARD_GLOBAL_SCHEMA "@prefix@/share/midgard -2.0/MgdObjects.xml"3 #define MIDGARD_GLOBAL_SCHEMA "@prefix@/share/midgard2/MgdObjects.xml" 4 4 5 5 /* Define directory path where all 'local' schemas are stored. … … 7 7 * per virtual host or per application. 8 8 */ 9 #define MIDGARD_LSCHEMA_DIR "@prefix@/share/midgard -2.0/schema"10 #define MIDGARD_SHARE_DIR "@prefix@/share/midgard -2.0"9 #define MIDGARD_LSCHEMA_DIR "@prefix@/share/midgard2/schema" 10 #define MIDGARD_SHARE_DIR "@prefix@/share/midgard2" 11 11 #define MIDGARD_LIB_VERSION "@VERSION@" 12 12 #define MIDGARD_LIB_VERSION_STRING "@VERSION_STRING@" trunk/midgard/core/midgard/src/midgard_defs.h
r23585 r23656 24 24 } MidgardTypeAuth; 25 25 26 #define MIDGARD_PACKAGE_NAME "midgard -2.0"26 #define MIDGARD_PACKAGE_NAME "midgard2" 27 27 28 28 #endif /* MIDGARD_DEFS_H */
