diff --git a/build/GNUmakefile b/build/GNUmakefile
index 207de2b..a781fc2 100755
--- a/build/GNUmakefile
+++ b/build/GNUmakefile
@@ -19,6 +19,8 @@ prefix ?= /usr/local
# Destination root (/ is used if empty)
DESTDIR ?=
+WXINCLUDEDIR ?= /include/wx-2.8/wx
+
#
AR ?= ar
@@ -524,11 +526,9 @@ make_dir_pdfdoc_dll:
ifeq ($(WX_SHARED),1)
install_pdfdoc_dll_headers:
$(INSTALL) -d $(DESTDIR)$(prefix)
+ $(INSTALL) -d $(DESTDIR)$(prefix)$(WXINCLUDEDIR)
for f in $(PDFDOC_DLL_HEADERS); do \
- if test ! -d $(DESTDIR)$(prefix)/`dirname $$f` ; then \
- $(INSTALL) -d $(DESTDIR)$(prefix)/`dirname $$f`; \
- fi; \
- $(INSTALL) -m 644 ../$$f $(DESTDIR)$(prefix)/$$f; \
+ $(INSTALL) -m 644 ../$$f $(DESTDIR)$(prefix)$(WXINCLUDEDIR); \
done
endif
@@ -543,7 +543,7 @@ endif
$(CXX) -o $@ $(MINIMAL_OBJECTS) $(VAR_7) -L../lib $(LDFLAGS) $(__COMPONENT_LIB_LIBR) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs xml,core,base`
../samples/pdfdc/printing: $(DCSAMPLE_OBJECTS) $(__COMPONENT_LIB_DEP)
- $(CXX) -o $@ $(DCSAMPLE_OBJECTS) $(VAR_7) -L../lib $(LDFLAGS) $(__COMPONENT_LIB_LIBR) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs xml,core,base`
+ $(CXX) -o $@ $(DCSAMPLE_OBJECTS) $(VAR_7) -L../lib $(LDFLAGS) $(__COMPONENT_LIB_LIBR) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs xml,core,base,richtext,html`
../makefont/makefont: $(MAKEFONT_OBJECTS) $(__COMPONENT_LIB_DEP)
$(CXX) -o $@ $(MAKEFONT_OBJECTS) $(VAR_7) -L../lib $(LDFLAGS) $(__COMPONENT_LIB_LIBR) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs xml,core,base`