Fix build in the NOPORTDOCS=yes case.

Spotted by:	QAT
This commit is contained in:
Hiroki Sato 2010-10-03 13:42:06 +00:00
parent 6ffa166da6
commit 0ec8087ea5
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=262349
4 changed files with 57 additions and 6 deletions

View file

@ -7,7 +7,7 @@
PORTNAME= pcb PORTNAME= pcb
PORTVERSION= 20100929 PORTVERSION= 20100929
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= cad CATEGORIES= cad
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@ -20,6 +20,7 @@ RUN_DEPENDS= m4>=1.4.11:${PORTSDIR}/devel/m4 \
BUILD_DEPENDS= ${RUN_DEPENDS} BUILD_DEPENDS= ${RUN_DEPENDS}
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
USE_AUTOTOOLS= autoconf:267
USE_GMAKE= yes USE_GMAKE= yes
USE_TK_RUN= 83 USE_TK_RUN= 83
INSTALLS_ICONS= yes INSTALLS_ICONS= yes

View file

@ -1,11 +1,27 @@
--- Makefile.in.orig 2010-05-21 03:09:49.000000000 +0900 --- Makefile.in.orig 2010-09-30 05:52:41.000000000 +0900
+++ Makefile.in 2010-05-21 05:07:04.000000000 +0900 +++ Makefile.in 2010-10-03 22:23:20.000000000 +0900
@@ -282,11 +282,11 @@ @@ -135,6 +135,7 @@
target_alias = @target_alias@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
+EXAMPLE = @EXAMPLE@
EXEEXT = @EXEEXT@
FONTFILENAME = @FONTFILENAME@
GDLIB_CONFIG = @GDLIB_CONFIG@
@@ -240,6 +241,7 @@
STRIP = @STRIP@
TEXI2DVI = @TEXI2DVI@
TOPDIRS = @TOPDIRS@
+TUTORIAL = @TUTORIAL@
UPDATE_DESKTOP_DATABASE = @UPDATE_DESKTOP_DATABASE@
UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
@@ -313,11 +315,11 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
-DIRS = win32 intl src data lib newlib example tools tutorial README_FILES po tests -DIRS = win32 intl src data lib newlib example tools tutorial README_FILES po tests
+DIRS = intl src data lib newlib example tools tutorial README_FILES po tests +DIRS = intl src data lib newlib @EXAMPLE@ tools @TUTORIAL@ README_FILES po tests
SUBDIRS = ${DIRS} @DOC@ SUBDIRS = ${DIRS} @DOC@
DIST_SUBDIRS = ${DIRS} doc DIST_SUBDIRS = ${DIRS} doc
INTLTOOL_FILES = intltool-extract.in intltool-merge.in intltool-update.in INTLTOOL_FILES = intltool-extract.in intltool-merge.in intltool-update.in

View file

@ -0,0 +1,31 @@
--- configure.ac.orig 2010-09-30 05:38:34.000000000 +0900
+++ configure.ac 2010-10-03 22:29:55.000000000 +0900
@@ -54,20 +54,28 @@
[
if test "X$enable_doc" = "Xno" ; then
DOC=""
+ EXAMPLE=""
+ TUTORIAL=""
AC_MSG_RESULT([no])
docs_yesno=no
else
DOC=doc
+ EXAMPLE=example
+ TUTORIAL=tutorial
AC_MSG_RESULT([yes])
docs_yesno=yes
fi
],
[
DOC=doc
+EXAMPLE=example
+TUTORIAL=tutorial
AC_MSG_RESULT([yes])
docs_yesno=yes
])
AC_SUBST(DOC)
+AC_SUBST(EXAMPLE)
+AC_SUBST(TUTORIAL)
AC_MSG_CHECKING([if maintainer mode is required])

View file

@ -50,6 +50,9 @@ share/mimelnk/application/x-pcb-layout.desktop
share/mimelnk/application/x-pcb-netlist.desktop share/mimelnk/application/x-pcb-netlist.desktop
@dirrmtry share/mimelnk/application @dirrmtry share/mimelnk/application
@dirrmtry share/mimelnk @dirrmtry share/mimelnk
share/gEDA/scheme/gnet-pcbfwd.scm
@dirrmtry share/gEDA/scheme
@dirrmtry share/gEDA
%%DATADIR%%/default_font %%DATADIR%%/default_font
%%DATADIR%%/gpcb-menu.res %%DATADIR%%/gpcb-menu.res
%%DATADIR%%/pcb-menu.res %%DATADIR%%/pcb-menu.res