mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-04-23 03:32:51 -06:00
Put jar file in share instead of lib
This commit is contained in:
@@ -152,9 +152,9 @@ install-gfdoc:
|
|||||||
$(INSTALL) util/gfdoc $(bindir)
|
$(INSTALL) util/gfdoc $(bindir)
|
||||||
|
|
||||||
install-editor:
|
install-editor:
|
||||||
$(INSTALL) -d $(libdir)/GF-$(PACKAGE_VERSION)
|
$(INSTALL) -d $(datadir)/GF-$(PACKAGE_VERSION)
|
||||||
$(INSTALL) jgf $(bindir)
|
$(INSTALL) jgf $(bindir)
|
||||||
$(INSTALL) -m 0644 java/gf-java.jar $(libdir)/GF-$(PACKAGE_VERSION)
|
$(INSTALL) -m 0644 java/gf-java.jar $(datedir)/GF-$(PACKAGE_VERSION)
|
||||||
|
|
||||||
install: install-gf install-gfdoc install-editor
|
install: install-gf install-gfdoc install-editor
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
include config.mk
|
include config.mk
|
||||||
|
|
||||||
GF_LIB_DIR=$(libdir)/GF-$(PACKAGE_VERSION)
|
GF_DATA_DIR=$(datadir)/GF-$(PACKAGE_VERSION)
|
||||||
|
|
||||||
.PHONY: install
|
.PHONY: install
|
||||||
install:
|
install:
|
||||||
$(INSTALL) -d $(bindir)
|
$(INSTALL) -d $(bindir)
|
||||||
$(INSTALL) gf gfdoc jgf $(bindir)
|
$(INSTALL) gf gfdoc jgf $(bindir)
|
||||||
$(INSTALL) -d $(GF_LIB_DIR)
|
$(INSTALL) -d $(GF_DATA_DIR)
|
||||||
$(INSTALL) -m 0644 gf-java.jar $(GF_LIB_DIR)
|
$(INSTALL) -m 0644 gf-java.jar $(GF_DATA_DIR)
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ prefix = @prefix@
|
|||||||
exec_prefix = @exec_prefix@
|
exec_prefix = @exec_prefix@
|
||||||
bindir = @bindir@
|
bindir = @bindir@
|
||||||
libdir = @libdir@
|
libdir = @libdir@
|
||||||
|
datadir = @datadir@
|
||||||
|
|
||||||
host = @host@
|
host = @host@
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
%define name GF
|
%define name GF
|
||||||
%define version 2.0
|
%define version 2.0
|
||||||
%define release 1
|
%define release 2
|
||||||
|
|
||||||
Name: %{name}
|
Name: %{name}
|
||||||
Summary: Grammatical Framework
|
Summary: Grammatical Framework
|
||||||
@@ -58,15 +58,20 @@ cd src
|
|||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
%files
|
%files
|
||||||
|
%defattr(-,root,root,0755)
|
||||||
%{_bindir}/gf
|
%{_bindir}/gf
|
||||||
%{_bindir}/gfdoc
|
%{_bindir}/gfdoc
|
||||||
%{_bindir}/jgf
|
%{_bindir}/jgf
|
||||||
%{_libdir}/%{name}-%{version}/gf-java.jar
|
%{_datadir}/%{name}-%{version}/gf-java.jar
|
||||||
%doc LICENSE README doc/{DocGF.pdf,gf2-highlights.html,index.html}
|
%doc LICENSE README doc/{DocGF.pdf,gf2-highlights.html,index.html}
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
|
||||||
|
* Thu Jun 24 2004 Bjorn Bringert <bringert@cs.chalmers.se> 2.0-2
|
||||||
|
- Set ownership correctly.
|
||||||
|
- Move jar-file to share (thanks to Anders Carlsson for pointing this out.)
|
||||||
|
|
||||||
* Tue Jun 22 2004 Bjorn Bringert <bringert@cs.chalmers.se> 2.0-1
|
* Tue Jun 22 2004 Bjorn Bringert <bringert@cs.chalmers.se> 2.0-1
|
||||||
- Include gfdoc binary
|
- Include gfdoc binary
|
||||||
|
|
||||||
|
|||||||
@@ -3,11 +3,11 @@
|
|||||||
prefix=@prefix@
|
prefix=@prefix@
|
||||||
exec_prefix=@exec_prefix@
|
exec_prefix=@exec_prefix@
|
||||||
GF_BIN_DIR=@bindir@
|
GF_BIN_DIR=@bindir@
|
||||||
GF_LIB_DIR=@libdir@/GF-@PACKAGE_VERSION@
|
GF_DATA_DIR=@datadir@/GF-@PACKAGE_VERSION@
|
||||||
|
|
||||||
JAVA=@JAVA@
|
JAVA=@JAVA@
|
||||||
|
|
||||||
GF=$GF_BIN_DIR/gf
|
GF=$GF_BIN_DIR/gf
|
||||||
JARFILE=$GF_LIB_DIR/gf-java.jar
|
JARFILE=$GF_DATA_DIR/gf-java.jar
|
||||||
|
|
||||||
exec $JAVA -jar $JARFILE "$GF -java $*"
|
exec $JAVA -jar $JARFILE "$GF -java $*"
|
||||||
|
|||||||
Reference in New Issue
Block a user