doc fixes

64 bits should use /usr/lib64, not /usr/lib
This commit is contained in:
Vitor Santos Costa 2010-10-24 21:26:49 +02:00
parent 9770904f6f
commit facebe43e4
5 changed files with 104 additions and 17 deletions

View File

@ -30,7 +30,7 @@ INFODIR=$(SHAREDIR)/info
# #
# where to store documentaion files # where to store documentaion files
# #
DOCSDIR=$(SHAREDIR)/docs/Yap DOCSDIR=$(SHAREDIR)/doc/Yap
# #
# Add this flag to YAP_EXTRAS if you need the extension: # Add this flag to YAP_EXTRAS if you need the extension:
@ -730,6 +730,13 @@ install_docs:
$(INSTALL_DATA) yap.html* $(DESTDIR)$(DOCSDIR) $(INSTALL_DATA) yap.html* $(DESTDIR)$(DOCSDIR)
$(INSTALL_DATA) yap.pdf $(DESTDIR)$(DOCSDIR) $(INSTALL_DATA) yap.pdf $(DESTDIR)$(DOCSDIR)
$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(DOCSDIR) $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(DOCSDIR)
$(INSTALL_DATA) $(srcdir)/Artistic $(DESTDIR)$(DOCSDIR)
$(INSTALL_DATA) $(srcdir)/COPYING $(DESTDIR)$(DOCSDIR)
$(INSTALL_DATA) $(srcdir)/changes4.3.html $(DESTDIR)$(DOCSDIR)
$(INSTALL_DATA) $(srcdir)/changes-5.0.html $(DESTDIR)$(DOCSDIR)
$(INSTALL_DATA) $(srcdir)/changes-5.1.html $(DESTDIR)$(DOCSDIR)
$(INSTALL_DATA) $(srcdir)/changes-6.0.html $(DESTDIR)$(DOCSDIR)
info: yap.info info: yap.info

View File

@ -1,7 +1,7 @@
#%define _unpackaged_files_terminate_build 0 #%define _unpackaged_files_terminate_build 0
#%undefine __check_files #%undefine __check_files
Name: Yap Name: yap
Summary: Prolog Compiler Summary: Prolog Compiler
Version: 6.2.0 Version: 6.2.0
Packager: Vitor Santos Costa <vsc@dcc.fc.up.pt> Packager: Vitor Santos Costa <vsc@dcc.fc.up.pt>
@ -36,6 +36,8 @@ rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
mkdir -p $RPM_BUILD_ROOT/usr/share/info mkdir -p $RPM_BUILD_ROOT/usr/share/info
make DESTDIR=$RPM_BUILD_ROOT install_info make DESTDIR=$RPM_BUILD_ROOT install_info
mkdir -p $RPM_BUILD_ROOT/usr/share/doc/Yap
make DESTDIR=$RPM_BUILD_ROOT install_docs
%post %post
/sbin/install-info --quiet /usr/share/info/yap.info --section "Programming Languages" /usr/share/info/dir /sbin/install-info --quiet /usr/share/info/yap.info --section "Programming Languages" /usr/share/info/dir
@ -54,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/file.list.%{name}
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc README* %doc README*
%doc INSTALL %doc INSTALL
%doc changes-6.0.html
%doc changes-5.1.html
%doc changes-5.0.html
%doc changes4.3.html %doc changes4.3.html
%doc docs/yap.tex %doc docs/yap.tex
/usr/bin/yap /usr/bin/yap
@ -63,6 +68,7 @@ rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/file.list.%{name}
/usr/share/Yap/ /usr/share/Yap/
/usr/share/info/yap.info* /usr/share/info/yap.info*
/usr/share/info/pillow_doc.info* /usr/share/info/pillow_doc.info*
/usr/share/doc/Yap
%changelog %changelog

74
misc/Yap64.spec Normal file
View File

@ -0,0 +1,74 @@
#%define _unpackaged_files_terminate_build 0
#%undefine __check_files
Name: yap
Summary: Prolog Compiler
Version: 6.2.0
Packager: Vitor Santos Costa <vsc@dcc.fc.up.pt>
Release: 1
Source: http://www.dcc.fc.up.pt/~vsc/Yap/%{name}-%{version}.tar.gz
License: Perl Artistic License, LGPL
Provides: yap
Requires: readline, unixODBC, gmp, cudd
Group: Development/Languages
URL: http://www.dcc.fc.up.pt/~vsc/Yap
Prefix: /usr
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
%description
A high-performance Prolog compiler developed at
Universidade do Porto and Universidade Federal do Rio de Janeiro. The Prolog engine is based in the WAM (Warren
Abstract Machine), with several optimizations for better
performance. YAP follows the Edinburgh tradition, and is largely
compatible with the ISO-Prolog standard and with Quintus and SICStus
Prolog.
%prep
%setup -q
%build
./configure --prefix=/usr --prefix=/usr --libdir=/usr/lib64 --enable-max-performance --enable-depth-limit
make
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
mkdir -p $RPM_BUILD_ROOT/usr/share/info
make DESTDIR=$RPM_BUILD_ROOT install_info
mkdir -p $RPM_BUILD_ROOT/usr/share/doc/Yap
make DESTDIR=$RPM_BUILD_ROOT install_docs
%post
/sbin/install-info --quiet /usr/share/info/yap.info --section "Programming Languages" /usr/share/info/dir
/sbin/install-info --quiet /usr/share/info/pillow_doc.info --section "Programming Languages" /usr/share/info/dir
%postun
/sbin/install-info --quiet --delete yap.info /usr/share/info/dir
/sbin/install-info --quiet --delete pillow_doc.info /usr/share/info/dir
rm -f /usr/info/yap.info*
%clean
rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/file.list.%{name}
%files
%defattr(-,root,root,-)
%doc README*
%doc INSTALL
%doc changes-6.0.html
%doc changes-5.1.html
%doc changes-5.0.html
%doc changes4.3.html
%doc docs/yap.tex
/usr/bin/yap
/usr/lib64/Yap/
/usr/lib64/libYap.a
/usr/include/Yap/
/usr/share/Yap/
/usr/share/info/yap.info*
/usr/share/info/pillow_doc.info*
/usr/share/doc/Yap
%changelog

View File

@ -29,7 +29,7 @@ ComponentText "This will install YAP on your computer."
DirText "This program will install YAP on your computer.\ DirText "This program will install YAP on your computer.\
Choose a directory" Choose a directory"
LicenseData c:\Yap\share\docs\Yap\Artistic LicenseData c:\Yap\share\doc\Yap\Artistic
LicenseText "YAP is governed by the Artistic License,\ LicenseText "YAP is governed by the Artistic License,\
but includes code under the GPL and LGPL." but includes code under the GPL and LGPL."
@ -65,12 +65,12 @@ Section "Base system (required)"
; SYSTEM STUFF ; SYSTEM STUFF
File /r c:\Yap\share\Yap\* File /r c:\Yap\share\Yap\*
SetOutPath $INSTDIR\docs\Yap SetOutPath $INSTDIR\doc\Yap
File c:\Yap\share\docs\Yap\yap.html File c:\Yap\share\doc\Yap\yap.html
File c:\Yap\share\docs\Yap\yap.pdf File c:\Yap\share\doc\Yap\yap.pdf
File c:\Yap\share\docs\Yap\Artistic File c:\Yap\share\doc\Yap\Artistic
File c:\Yap\share\docs\Yap\README.TXT File c:\Yap\share\doc\Yap\README.TXT
File c:\Yap\share\docs\Yap\COPYING.TXT File c:\Yap\share\doc\Yap\COPYING.TXT
WriteRegStr HKLM ${REGKEY} "home" "$INSTDIR" WriteRegStr HKLM ${REGKEY} "home" "$INSTDIR"
WriteRegStr HKLM ${REGKEY} "startup" "$INSTDIR\lib\startup.yss" WriteRegStr HKLM ${REGKEY} "startup" "$INSTDIR\lib\startup.yss"
@ -94,16 +94,16 @@ Section "Start Menu shortcuts"
0 0
SetOutPath $INSTDIR SetOutPath $INSTDIR
CreateShortCut "$SMPROGRAMS\${GRP}\Readme.lnk" \ CreateShortCut "$SMPROGRAMS\${GRP}\Readme.lnk" \
"$INSTDIR\docs\Yap\README.TXT" "" \ "$INSTDIR\doc\Yap\README.TXT" "" \
"$INSTDIR\docs\Yap\README.TXT" 0 \ "$INSTDIR\doc\Yap\README.TXT" 0 \
"SW_SHOWNORMAL" "" "View readme" "SW_SHOWNORMAL" "" "View readme"
CreateShortCut "$SMPROGRAMS\${GRP}\Manual Html.lnk" \ CreateShortCut "$SMPROGRAMS\${GRP}\Manual Html.lnk" \
"$INSTDIR\docs\Yap\yap.html" "" \ "$INSTDIR\doc\Yap\yap.html" "" \
"$INSTDIR\docs\Yap\yap.html" 0 \ "$INSTDIR\doc\Yap\yap.html" 0 \
"SW_SHOWNORMAL" "" "View readme" "SW_SHOWNORMAL" "" "View readme"
CreateShortCut "$SMPROGRAMS\${GRP}\Manual PDF.lnk" \ CreateShortCut "$SMPROGRAMS\${GRP}\Manual PDF.lnk" \
"$INSTDIR\docs\Yap\yap.pdf" "" \ "$INSTDIR\doc\Yap\yap.pdf" "" \
"$INSTDIR\docs\Yap\yap.pdf" 0 \ "$INSTDIR\doc\Yap\yap.pdf" 0 \
"SW_SHOWNORMAL" "" "View readme" "SW_SHOWNORMAL" "" "View readme"
CreateShortCut "$SMPROGRAMS\${GRP}\Uninstall.lnk" \ CreateShortCut "$SMPROGRAMS\${GRP}\Uninstall.lnk" \
"$INSTDIR\uninstall.exe" \ "$INSTDIR\uninstall.exe" \
@ -256,7 +256,7 @@ FunctionEnd
Function .onInstSuccess Function .onInstSuccess
MessageBox MB_YESNO "Installation complete. View readme?" IDNO NoReadme MessageBox MB_YESNO "Installation complete. View readme?" IDNO NoReadme
ExecShell "open" "$INSTDIR\docs\README.TXT" ExecShell "open" "$INSTDIR\doc\README.TXT"
NoReadme: NoReadme:
FunctionEnd FunctionEnd

@ -1 +1 @@
Subproject commit f11e3d43683f708fe7011dff7cd8f9b495cfda17 Subproject commit 73e4e086d06c54210100f0faaeccbea276c707eb