* update rpm and deb building for new docs/Makefile.fpc

install/debian/fp-units-misc.install.in

@@ -11,3 +11,4 @@
 /usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/syslog
 /usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/gdbint
 /usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/unzip
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/newt

install/debian/moveexamples

@@ -31,7 +31,7 @@ GNOME1_PACKAGES="imlib zvt gnome gconf"
 BASE_PACKAGES="paszlib pasjpeg regexpr ncurses md5"
 GFX_PACKAGES="forms ggi libgd svgalib opengl"
 DB_PACKAGES="ibase mysql oracle postgres gdbm odbc"
-MISC_PACKAGES="gdbint utmp syslog cdrom tcl"
+MISC_PACKAGES="gdbint utmp syslog cdrom tcl newt"
 NET_PACKAGES="netdb"
 
 move_examples fcl "$FCL_PACKAGES"

install/debian/rules

@@ -176,7 +176,7 @@ build-indep-stamp: debian-files-stamp build-arch-stamp
 	@echo "--- Building Documentation"
 	dh_testdir
 
-	$(MAKE) -C docs $(DOCTYPE) FPDOC=$(NEWFPDOC) 
+	$(MAKE) -C docs $(DOCTYPE) $(BUILDOPTS) FPDOC=$(NEWFPDOC) 
 
 	touch build-indep-stamp
 
@@ -188,7 +188,7 @@ install-indep-stamp: debian-files build-indep
 	dh_testroot
 	dh_clean -k
 
-	$(MAKE) -C docs $(DOCTYPE)install DOCINSTALLDIR=$(INSTALL_DIR)/usr/share/doc/fp-docs
+	$(MAKE) -C docs $(DOCTYPE)install $(INSTALLOPTS) INSTALL_DOCDIR=$(INSTALL_DIR)/usr/share/doc/fp-docs
 
 	touch install-indep-stamp
 

install/fpc.spec

@@ -95,7 +95,7 @@ INSTALLOPTS="FPC=${NEWPP} INSTALL_PREFIX=%{buildroot}/usr INSTALL_LIBDIR=%{build
 	make man_install ${INSTALLOPTS} INSTALL_MANDIR=%{buildmandir}
 	
 if [ -z ${NODOCS} ]; then
-	make -C docs pdfinstall ${INSTALLOPTS} DOCINSTALLDIR=%{builddocdir}
+	make -C docs pdfinstall ${INSTALLOPTS} INSTALL_DOCDIR=%{builddocdir}
 fi
 
 	# create link