equal
deleted
inserted
replaced
40 include $(WS_MAKE_RULES)/configure.mk |
40 include $(WS_MAKE_RULES)/configure.mk |
41 include $(WS_MAKE_RULES)/ips.mk |
41 include $(WS_MAKE_RULES)/ips.mk |
42 |
42 |
43 PKG_PROTO_DIRS += $(COMPONENT_DIR)/man |
43 PKG_PROTO_DIRS += $(COMPONENT_DIR)/man |
44 |
44 |
45 # We need to compile with /usr/lib/$(MACH64)/glib-2.0 |
45 # We need to compile with /usr/lib/$(MACH64)/glib-2.0 to ensure |
46 # https://defect.opensolaris.org/bz/show_bug.cgi?id=9957 |
46 # that 64-bit headers will be used, see content of |
|
47 # /usr/lib/64/pkgconfig/glib-2.0.pc |
47 $(BUILD_64): CONFIGURE_OPTIONS += PKG_CONFIG_PATH=/usr/lib/$(MACH64)/pkgconfig |
48 $(BUILD_64): CONFIGURE_OPTIONS += PKG_CONFIG_PATH=/usr/lib/$(MACH64)/pkgconfig |
48 |
49 |
49 # get rid of compiler path set in RUNPATH |
50 # get rid of compiler path set in RUNPATH |
50 LDFLAGS += $(studio_NORUNPATH) |
51 LDFLAGS += $(studio_NORUNPATH) |
51 LDFLAGS += $(CC_BITS) |
52 LDFLAGS += $(CC_BITS) |