diff options
Diffstat (limited to 'devel/autogen/files')
| -rw-r--r-- | devel/autogen/files/patch-autoopts-Makefile.in | 48 | ||||
| -rw-r--r-- | devel/autogen/files/patch-autoopts_Makefile.in | 31 |
2 files changed, 31 insertions, 48 deletions
diff --git a/devel/autogen/files/patch-autoopts-Makefile.in b/devel/autogen/files/patch-autoopts-Makefile.in deleted file mode 100644 index 8dba9e4b9a30..000000000000 --- a/devel/autogen/files/patch-autoopts-Makefile.in +++ /dev/null @@ -1,48 +0,0 @@ ---- autoopts/Makefile.in.orig 2011-09-28 18:24:36.000000000 +0800 -+++ autoopts/Makefile.in 2011-09-28 18:27:15.000000000 +0800 -@@ -377,7 +377,7 @@ - - SRC = $(HDRS) $(CSRC) $(GENSRC) - DEF_FILES = genshell.def $(srcdir)/funcs.def --pkgconfigdir = $(prefix)/libdata/pkgconfig -+pkgconfigdir = $(prefix)/libdata - CLEANFILES = tmp-* libopts.c - DISTCLEANFILES = $(GENMAN) $(GENTEXI) *-stamp - MAINTAINERCLEANFILES = $(GENHDRS) $(GENSRC) $(GENSCRIPTS) -@@ -650,27 +650,27 @@ - cd "$(DESTDIR)$(m4datadir)" && rm -f $$files - install-nobase_dataDATA: $(nobase_data_DATA) - @$(NORMAL_INSTALL) -- test -z "$(datadir)" || $(MKDIR_P) "$(DESTDIR)$(datadir)" -- @list='$(nobase_data_DATA)'; test -n "$(datadir)" || list=; \ -+ test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" -+ @list='$(nobase_data_DATA)'; test -n "$(pkgconfigdir)" || 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)$(datadir)/$$dir'"; \ -- $(MKDIR_P) "$(DESTDIR)$(datadir)/$$dir"; }; \ -- echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(datadir)/$$dir'"; \ -- $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(datadir)/$$dir" || exit $$?; }; \ -+ echo "$(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)/$$dir'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)/$$dir"; }; \ -+ echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(pkgconfigdir)/$$dir'"; \ -+ $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(pkgconfigdir)/$$dir" || exit $$?; }; \ - done - - uninstall-nobase_dataDATA: - @$(NORMAL_UNINSTALL) -- @list='$(nobase_data_DATA)'; test -n "$(datadir)" || list=; \ -+ @list='$(nobase_data_DATA)'; test -n "$(pkgconfigdir)" || list=; \ - $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \ - test -n "$$files" || exit 0; \ -- echo " ( cd '$(DESTDIR)$(datadir)' && rm -f" $$files ")"; \ -- cd "$(DESTDIR)$(datadir)" && rm -f $$files -+ echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ -+ cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files - install-nodist_pkgdataDATA: $(nodist_pkgdata_DATA) - @$(NORMAL_INSTALL) - test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" diff --git a/devel/autogen/files/patch-autoopts_Makefile.in b/devel/autogen/files/patch-autoopts_Makefile.in new file mode 100644 index 000000000000..2a8e91c30320 --- /dev/null +++ b/devel/autogen/files/patch-autoopts_Makefile.in @@ -0,0 +1,31 @@ +--- autoopts/Makefile.in.orig 2015-01-17 12:42:01.387596573 +0100 ++++ autoopts/Makefile.in 2015-01-17 12:45:19.424582917 +0100 +@@ -792,10 +792,10 @@ + dir='$(DESTDIR)$(m4datadir)'; $(am__uninstall_files_from_dir) + install-nobase_dataDATA: $(nobase_data_DATA) + @$(NORMAL_INSTALL) +- @list='$(nobase_data_DATA)'; test -n "$(datadir)" || list=; \ ++ @list='$(nobase_data_DATA)'; test -n "$(prefix)/libdata" || list=; \ + if test -n "$$list"; then \ +- echo " $(MKDIR_P) '$(DESTDIR)$(datadir)'"; \ +- $(MKDIR_P) "$(DESTDIR)$(datadir)" || exit 1; \ ++ echo " $(MKDIR_P) '$(DESTDIR)$(prefix)/libdata'"; \ ++ $(MKDIR_P) "$(DESTDIR)$(prefix)/libdata" || exit 1; \ + fi; \ + $(am__nobase_list) | while read dir files; do \ + xfiles=; for file in $$files; do \ +@@ -803,10 +803,10 @@ + else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \ + test -z "$$xfiles" || { \ + test "x$$dir" = x. || { \ +- echo " $(MKDIR_P) '$(DESTDIR)$(datadir)/$$dir'"; \ +- $(MKDIR_P) "$(DESTDIR)$(datadir)/$$dir"; }; \ +- echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(datadir)/$$dir'"; \ +- $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(datadir)/$$dir" || exit $$?; }; \ ++ echo " $(MKDIR_P) '$(DESTDIR)$(prefix)/libdata/$$dir'"; \ ++ $(MKDIR_P) "$(DESTDIR)$(prefix)/libdata/$$dir"; }; \ ++ echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(prefix)/libdata/$$dir'"; \ ++ $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(prefix)/libdata/$$dir" || exit $$?; }; \ + done + + uninstall-nobase_dataDATA: |