at master 1.6 kB view raw
1diff --git a/Makefile.PL b/Makefile.PL 2index 55c485c..8501c02 100644 3--- a/Makefile.PL 4+++ b/Makefile.PL 5@@ -124,14 +124,7 @@ if ($^O eq 'MSWin32' || $IS_W32API) 6 # Look for available libs 7 our @libdirs = qw 8 { 9- -L/usr/lib 10- -L/usr/lib/i386-linux-gnu 11- -L/usr/X11R6/lib 12- -L/opt/X11/lib 13- -L/usr/local/lib 14- -L/usr/openwin/lib 15- -L/opt/csw/lib 16- -L/usr/local/freeglut/lib 17+ @@libpaths@@ 18 }; 19 20 our @check_libs = qw 21@@ -764,7 +759,6 @@ sub get_extensions 22 my $exc_file = 'gl_exclude.h'; 23 unlink($exc_file) if (-e $exc_file); 24 my $glv_file = 'utils/glversion.txt'; 25- unlink($glv_file) if (-e $glv_file); 26 27 # Only run the rest if GLUT is installed 28 print "Testing GLUT version\n" if ($verbose); 29@@ -817,7 +811,7 @@ sub get_extensions 30 $make_ver = ";make -f Makefile " . (length($lib) ? "GLUT_LIB=$lib " : "") . (length($def) ? "GLUT_DEF=$def " : ""); 31 print "glversion: '$make_ver'\n" if $verbose>1; 32 } 33- my $exec = 'cd utils'."$make_ver clean".$make_ver; 34+ my $exec = 'cd utils'.$make_ver; 35 print "glversion: $exec\n" if ($verbose); 36 my $stat = `$exec`; 37 print "\n$stat\n\n" if ($verbose); 38diff --git a/utils/Makefile b/utils/Makefile 39index 910dcaf..1b1ac57 100644 40--- a/utils/Makefile 41+++ b/utils/Makefile 42@@ -21,14 +21,13 @@ EXTRALIBS=-lGLU -lXi -lXmu -lXext -lX11 -lm 43 all: glversion.txt 44 45 glversion.txt: glversion 46- ./glversion > glversion.txt 47+ echo "skipping build of glversion.txt" 48 49 glversion: glversion.o 50 ${LINK} glversion.o ${LDFLAGS} ${EXTRALIBS} -o glversion 51 chmod u+x glversion 52 53 clean: 54- rm -f glversion.txt 55 rm -f glversion 56 rm -f glversion.o 57