From: ol.sc <ol.sc@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Thu, 5 Jan 2012 16:36:27 +0000 (+0000)
Subject: Replace some more instance of geos.lib with geos-cbm.lib.
X-Git-Tag: V2.13.3~75
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fb3c3f6a68b4d30bef19212d23c4589f6a2cd893;p=cc65

Replace some more instance of geos.lib with geos-cbm.lib.

git-svn-id: svn://svn.cc65.org/cc65/trunk@5390 b7a2c559-68d2-44c3-8de9-860c34a00d81
---

diff --git a/doc/grc65.sgml b/doc/grc65.sgml
index 1e7b4ea09..c98cfc2a1 100644
--- a/doc/grc65.sgml
+++ b/doc/grc65.sgml
@@ -249,7 +249,7 @@ contains all of the executable code.
 
 <sect2>Fourth and last step -- linking it together
 <tscreen><verb>
-ld65 -t geos-cbm -o test.cvt testres.o test.o geos.lib
+ld65 -t geos-cbm -o test.cvt testres.o test.o geos-cbm.lib
 </verb></tscreen>
 The last file is the GEOS system library.
 
@@ -309,7 +309,7 @@ ca65 -t geos-cbm overlay-demo.s
 
 <sect2>Fourth and last step -- linking it together
 <tscreen><verb>
-ld65 -t geos-cbm -o overlay-demo.cvt -m overlay-demo.map overlay-demores.o overlay-demo.o geos.lib
+ld65 -t geos-cbm -o overlay-demo.cvt -m overlay-demo.map overlay-demores.o overlay-demo.o geos-cbm.lib
 </verb></tscreen>
 
 
diff --git a/libsrc/geos-cbm/Makefile b/libsrc/geos-cbm/Makefile
index 3bf22be0d..d07619a2e 100644
--- a/libsrc/geos-cbm/Makefile
+++ b/libsrc/geos-cbm/Makefile
@@ -23,5 +23,5 @@ clean:
 
 .PHONY: zap
 zap:	clean
-	@$(RM) ../geos.lib
+	@$(RM) ../geos-cbm.lib
 
diff --git a/packages/rpm/redhat/cc65.spec b/packages/rpm/redhat/cc65.spec
index c662a4243..5749a19a6 100644
--- a/packages/rpm/redhat/cc65.spec
+++ b/packages/rpm/redhat/cc65.spec
@@ -325,7 +325,7 @@ GEOS programs for the C64/C128 using the cc65 crosscompiler.
 
 %files geos
 %attr(755,root,root)        /usr/bin/grc65
-%attr(644,root,root)        %{_libdir}/cc65/lib/geos.lib
+%attr(644,root,root)        %{_libdir}/cc65/lib/geos-cbm.lib
 %attr(755,root,root) %dir   %{_libdir}/cc65/include/geos
 %attr(644,root,root)        %{_libdir}/cc65/include/geos/*.h
 %attr(644,root,root)        %{_libdir}/cc65/emd/geos-*.emd