mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-03 06:04:53 +00:00
Fix build - remove duplicate patches. No idea how they got there.
Pointy hat to: philip
This commit is contained in:
parent
ffd77e6508
commit
42d6ae5caa
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=261622
@ -16,21 +16,3 @@
|
||||
if TINYGUI
|
||||
@echo "Shrink installed images by a factor of two."
|
||||
(cd $(top_srcdir) && find data/core/images data/campaigns images \( $(findfilterflags) -a -name '*.png' -and -not -name 'bar-energy-tinygui.png' -print \) ) | while read p; do \
|
||||
--- Makefile.am~
|
||||
+++ Makefile.am
|
||||
@@ -73,6 +73,7 @@ if INSTALLDATA
|
||||
echo $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
|
||||
$(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
|
||||
done
|
||||
+if INSTALLDOCS
|
||||
@echo "Replicate doc directory skeleton under target doc subdirectory"
|
||||
@echo "Then copy all corresponding files."
|
||||
test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
|
||||
@@ -84,6 +85,7 @@ if INSTALLDATA
|
||||
echo $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
|
||||
$(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; cd ..; \
|
||||
done
|
||||
+endif
|
||||
if TINYGUI
|
||||
@echo "Shrink installed images by a factor of two."
|
||||
(cd $(top_srcdir) && find data/core/images data/campaigns images \( $(findfilterflags) -a -name '*.png' -and -not -name 'bar-energy-tinygui.png' -print \) ) | while read p; do \
|
||||
|
@ -21,15 +21,3 @@
|
||||
|
||||
AC_ARG_ENABLE([game],
|
||||
AS_HELP_STRING([--disable-game], [disable compilation of game]),
|
||||
@@ -213,6 +213,11 @@ esac
|
||||
AC_SUBST([FULLLOCALEDIR])
|
||||
AC_SUBST([HAS_RELATIVE_LOCALEDIR])
|
||||
|
||||
+AC_ARG_WITH([docs],
|
||||
+ AS_HELP_STRING([--without-docs], [don't install wesnoth manual]),
|
||||
+ [docs=$withval],
|
||||
+ [docs=yes])
|
||||
+AM_CONDITIONAL([INSTALLDOCS], [test x$docs = xyes])
|
||||
|
||||
AC_ARG_ENABLE([game],
|
||||
AS_HELP_STRING([--disable-game], [disable compilation of game]),
|
||||
|
Loading…
Reference in New Issue
Block a user