[packages/gcvs.git] / gcvs-nocvsunix.patch

diff -Naur gcvs-1.0a6.orig/Makefile.am gcvs-1.0a6/Makefile.am
--- gcvs-1.0a6.orig/Makefile.am	Wed Jul  5 07:17:42 2000
+++ gcvs-1.0a6/Makefile.am	Mon Jul 15 11:23:03 2002
@@ -1,5 +1,5 @@
 EXTRA_DIST = GCVS-VERSION .cvsignore PORTING README.SUN gcvs.spec
-SUBDIRS = common cvstree rf gcvs Macros cvsunix GuiDoc
+SUBDIRS = common cvstree rf gcvs Macros GuiDoc
 
 etags:
 	etags -C `find . -name \*.cpp`
diff -Naur gcvs-1.0a6.orig/configure.in gcvs-1.0a6/configure.in
--- gcvs-1.0a6.orig/configure.in	Fri Aug 18 06:57:25 2000
+++ gcvs-1.0a6/configure.in	Mon Jul 15 11:25:16 2002
@@ -156,7 +156,6 @@
 packagesrcdir=`cd $srcdir && pwd`
 AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}/gcvs")
 
-AC_CONFIG_SUBDIRS(cvsunix)
 AC_OUTPUT(
 	Makefile \
 	common/Makefile \
--- gcvs-1.0a6/common/AppGlue.cpp~	Mon Jul 15 13:31:59 2002
+++ gcvs-1.0a6/common/AppGlue.cpp	Mon Jul 15 13:31:59 2002
@@ -879,16 +879,6 @@
 		cvscmd << kPathDelimiter;
 	cvscmd << "cvs";
 	UStr firstCmd = cvscmd;
-	if(stat(cvscmd, &sb) == -1 || !(S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode)))
-	{
-		cvscmd = PACKAGE_SOURCE_DIR;
-		CStr uppath, folder;
-		SplitPath(cvscmd, uppath, folder);
-		cvscmd = uppath;
-		if(!cvscmd.endsWith(kPathDelimiter))
-			cvscmd << kPathDelimiter;
-		cvscmd << "cvsunix/src/cvs";
-	}
 
 	if(stat(cvscmd, &sb) == -1 || !(S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode)))
 	{
Commit	Line	Data
f01a2512	1	diff -Naur gcvs-1.0a6.orig/Makefile.am gcvs-1.0a6/Makefile.am
	2	--- gcvs-1.0a6.orig/Makefile.am Wed Jul 5 07:17:42 2000
	3	+++ gcvs-1.0a6/Makefile.am Mon Jul 15 11:23:03 2002
20a93121	4	@@ -1,5 +1,5 @@
58f99a8d	5	EXTRA_DIST = GCVS-VERSION .cvsignore PORTING README.SUN gcvs.spec
20a93121	6	-SUBDIRS = common cvstree rf gcvs Macros cvsunix GuiDoc
	7	+SUBDIRS = common cvstree rf gcvs Macros GuiDoc
	8
	9	etags:
	10	etags -C `find . -name \*.cpp`
f01a2512	11	diff -Naur gcvs-1.0a6.orig/configure.in gcvs-1.0a6/configure.in
	12	--- gcvs-1.0a6.orig/configure.in Fri Aug 18 06:57:25 2000
	13	+++ gcvs-1.0a6/configure.in Mon Jul 15 11:25:16 2002
	14	@@ -156,7 +156,6 @@
	15	packagesrcdir=`cd $srcdir && pwd`
	16	AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}/gcvs")
	17
	18	-AC_CONFIG_SUBDIRS(cvsunix)
	19	AC_OUTPUT(
	20	Makefile \
	21	common/Makefile \
1efebf5f	22	--- gcvs-1.0a6/common/AppGlue.cpp~ Mon Jul 15 13:31:59 2002
	23	+++ gcvs-1.0a6/common/AppGlue.cpp Mon Jul 15 13:31:59 2002
	24	@@ -879,16 +879,6 @@
	25	cvscmd << kPathDelimiter;
	26	cvscmd << "cvs";
	27	UStr firstCmd = cvscmd;
	28	- if(stat(cvscmd, &sb) == -1 \|\| !(S_ISREG(sb.st_mode) \|\| S_ISLNK(sb.st_mode)))
	29	- {
	30	- cvscmd = PACKAGE_SOURCE_DIR;
	31	- CStr uppath, folder;
	32	- SplitPath(cvscmd, uppath, folder);
	33	- cvscmd = uppath;
	34	- if(!cvscmd.endsWith(kPathDelimiter))
	35	- cvscmd << kPathDelimiter;
	36	- cvscmd << "cvsunix/src/cvs";
	37	- }
	38
	39	if(stat(cvscmd, &sb) == -1 \|\| !(S_ISREG(sb.st_mode) \|\| S_ISLNK(sb.st_mode)))
	40	{