Fixed an installation problem
This commit is contained in:
parent
a3dbae7241
commit
3187e3a4ce
|
@ -35,20 +35,48 @@ xmlcopyeditor_SOURCES = xmlcopyeditor.cpp associatedialog.cpp casehandler.cpp \
|
|||
xmlcopyeditor_LDFLAGS = $(WX_LIBS) \
|
||||
-lexpat -lxslt -lxml2 -lpcre -lxerces-c $(ASPELL_LIBS) $(ENCHANT_LIBS)
|
||||
|
||||
dist_xmlcopyeditor_DATA = $(srcdir)/catalog/* \
|
||||
$(srcdir)/copying/* \
|
||||
$(srcdir)/dtd/* \
|
||||
$(srcdir)/help/* \
|
||||
nobase_dist_xmlcopyeditor_DATA = $(srcdir)/catalog/catalog \
|
||||
$(srcdir)/copying/*.txt \
|
||||
$(srcdir)/copying/Apache/LICENSE-2.0 \
|
||||
$(srcdir)/copying/Apache/LICENSE-2_files/* \
|
||||
$(srcdir)/copying/Aspell/* \
|
||||
$(srcdir)/copying/boost_shared_ptr/* \
|
||||
$(srcdir)/copying/Expat/* \
|
||||
$(srcdir)/copying/libxml2/* \
|
||||
$(srcdir)/copying/libxslt/* \
|
||||
$(srcdir)/copying/PCRE/* \
|
||||
$(srcdir)/copying/Scintilla/* \
|
||||
$(srcdir)/copying/wxStEditor/* \
|
||||
$(srcdir)/copying/wxStyledTextCtrl/* \
|
||||
$(srcdir)/copying/xmlcopyeditor/* \
|
||||
$(srcdir)/dtd/*.* \
|
||||
$(srcdir)/dtd/dita/*.* \
|
||||
$(srcdir)/dtd/docbook/4.4/*.* \
|
||||
$(srcdir)/dtd/docbook/4.4/ent/*.* \
|
||||
$(srcdir)/dtd/docbook/5.0b/*.* \
|
||||
$(srcdir)/dtd/tei/p4/*.* \
|
||||
$(srcdir)/dtd/tei/p5/*.* \
|
||||
$(srcdir)/help/*.* \
|
||||
$(srcdir)/help/html/*.* \
|
||||
$(srcdir)/png/*.png \
|
||||
$(srcdir)/po/*/messages.mo \
|
||||
$(srcdir)/rng/*.rnc \
|
||||
$(srcdir)/rng/*.rng \
|
||||
$(srcdir)/rng/exclude/*.rng \
|
||||
$(srcdir)/rng/modules/*.rng \
|
||||
$(srcdir)/rulesets/* \
|
||||
$(srcdir)/templates/* \
|
||||
$(srcdir)/rulesets/*.* \
|
||||
$(srcdir)/templates/*.dtd \
|
||||
$(srcdir)/templates/*.html \
|
||||
$(srcdir)/templates/*.lzx \
|
||||
$(srcdir)/templates/*.rng \
|
||||
$(srcdir)/templates/*.rss \
|
||||
$(srcdir)/templates/*.xlf \
|
||||
$(srcdir)/templates/*.xml \
|
||||
$(srcdir)/templates/*.xsd \
|
||||
$(srcdir)/templates/*.xsl \
|
||||
$(srcdir)/templates/*.xtm \
|
||||
$(srcdir)/xpm/*.xpm \
|
||||
$(srcdir)/xsl/*
|
||||
$(srcdir)/xsl/openlearn2daisyhtml/*.*
|
||||
|
||||
pixmap_DATA = xmlcopyeditor.png
|
||||
|
||||
|
|
|
@ -38,7 +38,7 @@ build_triplet = @build@
|
|||
host_triplet = @host@
|
||||
bin_PROGRAMS = xmlcopyeditor$(EXEEXT)
|
||||
subdir = src
|
||||
DIST_COMMON = $(dist_xmlcopyeditor_DATA) $(noinst_HEADERS) \
|
||||
DIST_COMMON = $(nobase_dist_xmlcopyeditor_DATA) $(noinst_HEADERS) \
|
||||
$(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/configure.in
|
||||
|
@ -125,7 +125,8 @@ am__uninstall_files_from_dir = { \
|
|||
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
|
||||
$(am__cd) "$$dir" && rm -f $$files; }; \
|
||||
}
|
||||
DATA = $(applications_DATA) $(dist_xmlcopyeditor_DATA) $(pixmap_DATA)
|
||||
DATA = $(applications_DATA) $(nobase_dist_xmlcopyeditor_DATA) \
|
||||
$(pixmap_DATA)
|
||||
HEADERS = $(noinst_HEADERS)
|
||||
ETAGS = etags
|
||||
CTAGS = ctags
|
||||
|
@ -285,20 +286,48 @@ xmlcopyeditor_SOURCES = xmlcopyeditor.cpp associatedialog.cpp casehandler.cpp \
|
|||
xmlcopyeditor_LDFLAGS = $(WX_LIBS) \
|
||||
-lexpat -lxslt -lxml2 -lpcre -lxerces-c $(ASPELL_LIBS) $(ENCHANT_LIBS)
|
||||
|
||||
dist_xmlcopyeditor_DATA = $(srcdir)/catalog/* \
|
||||
$(srcdir)/copying/* \
|
||||
$(srcdir)/dtd/* \
|
||||
$(srcdir)/help/* \
|
||||
nobase_dist_xmlcopyeditor_DATA = $(srcdir)/catalog/catalog \
|
||||
$(srcdir)/copying/*.txt \
|
||||
$(srcdir)/copying/Apache/LICENSE-2.0 \
|
||||
$(srcdir)/copying/Apache/LICENSE-2_files/* \
|
||||
$(srcdir)/copying/Aspell/* \
|
||||
$(srcdir)/copying/boost_shared_ptr/* \
|
||||
$(srcdir)/copying/Expat/* \
|
||||
$(srcdir)/copying/libxml2/* \
|
||||
$(srcdir)/copying/libxslt/* \
|
||||
$(srcdir)/copying/PCRE/* \
|
||||
$(srcdir)/copying/Scintilla/* \
|
||||
$(srcdir)/copying/wxStEditor/* \
|
||||
$(srcdir)/copying/wxStyledTextCtrl/* \
|
||||
$(srcdir)/copying/xmlcopyeditor/* \
|
||||
$(srcdir)/dtd/*.* \
|
||||
$(srcdir)/dtd/dita/*.* \
|
||||
$(srcdir)/dtd/docbook/4.4/*.* \
|
||||
$(srcdir)/dtd/docbook/4.4/ent/*.* \
|
||||
$(srcdir)/dtd/docbook/5.0b/*.* \
|
||||
$(srcdir)/dtd/tei/p4/*.* \
|
||||
$(srcdir)/dtd/tei/p5/*.* \
|
||||
$(srcdir)/help/*.* \
|
||||
$(srcdir)/help/html/*.* \
|
||||
$(srcdir)/png/*.png \
|
||||
$(srcdir)/po/*/messages.mo \
|
||||
$(srcdir)/rng/*.rnc \
|
||||
$(srcdir)/rng/*.rng \
|
||||
$(srcdir)/rng/exclude/*.rng \
|
||||
$(srcdir)/rng/modules/*.rng \
|
||||
$(srcdir)/rulesets/* \
|
||||
$(srcdir)/templates/* \
|
||||
$(srcdir)/rulesets/*.* \
|
||||
$(srcdir)/templates/*.dtd \
|
||||
$(srcdir)/templates/*.html \
|
||||
$(srcdir)/templates/*.lzx \
|
||||
$(srcdir)/templates/*.rng \
|
||||
$(srcdir)/templates/*.rss \
|
||||
$(srcdir)/templates/*.xlf \
|
||||
$(srcdir)/templates/*.xml \
|
||||
$(srcdir)/templates/*.xsd \
|
||||
$(srcdir)/templates/*.xsl \
|
||||
$(srcdir)/templates/*.xtm \
|
||||
$(srcdir)/xpm/*.xpm \
|
||||
$(srcdir)/xsl/*
|
||||
$(srcdir)/xsl/openlearn2daisyhtml/*.*
|
||||
|
||||
pixmap_DATA = xmlcopyeditor.png
|
||||
applications_DATA = xmlcopyeditor.desktop
|
||||
|
@ -493,23 +522,26 @@ uninstall-applicationsDATA:
|
|||
@list='$(applications_DATA)'; test -n "$(applicationsdir)" || list=; \
|
||||
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
|
||||
dir='$(DESTDIR)$(applicationsdir)'; $(am__uninstall_files_from_dir)
|
||||
install-dist_xmlcopyeditorDATA: $(dist_xmlcopyeditor_DATA)
|
||||
install-nobase_dist_xmlcopyeditorDATA: $(nobase_dist_xmlcopyeditor_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
test -z "$(xmlcopyeditordir)" || $(MKDIR_P) "$(DESTDIR)$(xmlcopyeditordir)"
|
||||
@list='$(dist_xmlcopyeditor_DATA)'; test -n "$(xmlcopyeditordir)" || list=; \
|
||||
for p in $$list; do \
|
||||
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
echo "$$d$$p"; \
|
||||
done | $(am__base_list) | \
|
||||
while read files; do \
|
||||
echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(xmlcopyeditordir)'"; \
|
||||
$(INSTALL_DATA) $$files "$(DESTDIR)$(xmlcopyeditordir)" || exit $$?; \
|
||||
@list='$(nobase_dist_xmlcopyeditor_DATA)'; test -n "$(xmlcopyeditordir)" || list=; \
|
||||
$(am__nobase_list) | while read dir files; do \
|
||||
xfiles=; for file in $$files; do \
|
||||
if test -f "$$file"; then xfiles="$$xfiles $$file"; \
|
||||
else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
|
||||
test -z "$$xfiles" || { \
|
||||
test "x$$dir" = x. || { \
|
||||
echo "$(MKDIR_P) '$(DESTDIR)$(xmlcopyeditordir)/$$dir'"; \
|
||||
$(MKDIR_P) "$(DESTDIR)$(xmlcopyeditordir)/$$dir"; }; \
|
||||
echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(xmlcopyeditordir)/$$dir'"; \
|
||||
$(INSTALL_DATA) $$xfiles "$(DESTDIR)$(xmlcopyeditordir)/$$dir" || exit $$?; }; \
|
||||
done
|
||||
|
||||
uninstall-dist_xmlcopyeditorDATA:
|
||||
uninstall-nobase_dist_xmlcopyeditorDATA:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
@list='$(dist_xmlcopyeditor_DATA)'; test -n "$(xmlcopyeditordir)" || list=; \
|
||||
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
|
||||
@list='$(nobase_dist_xmlcopyeditor_DATA)'; test -n "$(xmlcopyeditordir)" || list=; \
|
||||
$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
|
||||
dir='$(DESTDIR)$(xmlcopyeditordir)'; $(am__uninstall_files_from_dir)
|
||||
install-pixmapDATA: $(pixmap_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
|
@ -672,7 +704,7 @@ info: info-am
|
|||
info-am:
|
||||
|
||||
install-data-am: install-applicationsDATA \
|
||||
install-dist_xmlcopyeditorDATA install-pixmapDATA
|
||||
install-nobase_dist_xmlcopyeditorDATA install-pixmapDATA
|
||||
|
||||
install-dvi: install-dvi-am
|
||||
|
||||
|
@ -719,7 +751,7 @@ ps: ps-am
|
|||
ps-am:
|
||||
|
||||
uninstall-am: uninstall-applicationsDATA uninstall-binPROGRAMS \
|
||||
uninstall-dist_xmlcopyeditorDATA uninstall-pixmapDATA
|
||||
uninstall-nobase_dist_xmlcopyeditorDATA uninstall-pixmapDATA
|
||||
|
||||
.MAKE: install-am install-strip
|
||||
|
||||
|
@ -728,16 +760,17 @@ uninstall-am: uninstall-applicationsDATA uninstall-binPROGRAMS \
|
|||
distclean-generic distclean-libtool distclean-tags distdir dvi \
|
||||
dvi-am html html-am info info-am install install-am \
|
||||
install-applicationsDATA install-binPROGRAMS install-data \
|
||||
install-data-am install-dist_xmlcopyeditorDATA install-dvi \
|
||||
install-dvi-am install-exec install-exec-am install-html \
|
||||
install-html-am install-info install-info-am install-man \
|
||||
install-pdf install-pdf-am install-pixmapDATA install-ps \
|
||||
install-ps-am install-strip installcheck installcheck-am \
|
||||
installdirs maintainer-clean maintainer-clean-generic \
|
||||
mostlyclean mostlyclean-compile mostlyclean-generic \
|
||||
mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
|
||||
uninstall-am uninstall-applicationsDATA uninstall-binPROGRAMS \
|
||||
uninstall-dist_xmlcopyeditorDATA uninstall-pixmapDATA
|
||||
install-data-am install-dvi install-dvi-am install-exec \
|
||||
install-exec-am install-html install-html-am install-info \
|
||||
install-info-am install-man \
|
||||
install-nobase_dist_xmlcopyeditorDATA install-pdf \
|
||||
install-pdf-am install-pixmapDATA install-ps install-ps-am \
|
||||
install-strip installcheck installcheck-am installdirs \
|
||||
maintainer-clean maintainer-clean-generic mostlyclean \
|
||||
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
|
||||
pdf pdf-am ps ps-am tags uninstall uninstall-am \
|
||||
uninstall-applicationsDATA uninstall-binPROGRAMS \
|
||||
uninstall-nobase_dist_xmlcopyeditorDATA uninstall-pixmapDATA
|
||||
|
||||
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
|
|
Loading…
Reference in New Issue