Root/svgalib/patches/080-make-install.patch

1Index: svgalib-1.4.3/Makefile
2===================================================================
3--- svgalib-1.4.3.orig/Makefile 2011-01-06 13:52:48.000000000 +0100
4+++ svgalib-1.4.3/Makefile 2011-01-06 14:03:17.000000000 +0100
5@@ -110,10 +110,6 @@
6 
7 installheaders:
8     @echo Installing header files in $(includedir).
9- @if [ -f /usr/include/vga.h ]; then \
10- rm -f /usr/include/vga.h /usr/include/vgagl.h; \
11- echo Old header files in /usr/include removed.; \
12- fi
13     mkdir -p $(includedir)
14     @cp $(srcdir)/src/vga.h $(includedir)/vga.h
15     @chmod a+r $(includedir)/vga.h
16@@ -134,17 +130,6 @@
17         chmod a+r $(libdir)/$$foo; \
18     done
19 endif
20- @if [ -f /usr/lib/libvga.sa ]; then \
21- rm -f /usr/lib/libvga.sa /usr/lib/libvgagl.sa; \
22- echo Old stubs in /usr/lib removed.; \
23- fi
24- @rm -f $(OBSOLETESHAREDIMAGES)
25-ifndef KEEPSHAREDLIBS
26- @echo "Removing shared library images (old & current)..."
27- @for i in $(OBSOLETELDIRS); do \
28- rm -f `echo $(OBSOLETESHAREDIMAGES) | sed s?/lib/?$$i?g`; \
29- done
30-endif
31     mkdir -p $(sharedlibdir)
32     @echo Installing shared library image as \
33         $(addprefix $(sharedlibdir)/,$(notdir $(SHAREDLIBS))).
34@@ -153,7 +138,6 @@
35         (cd $(sharedlibdir); \
36          ln -sf $$foo `echo $$foo | sed 's/\.so\..*/.so/'` ); \
37     done
38- @ldconfig
39 
40 ifdef INSTALLAOUTDIR
41 
42@@ -169,7 +153,6 @@
43         (cd $(TOPDIR)/$(INSTALLAOUTDIR); \
44          ln -sf $$foo `echo $$foo | sed 's/\.so\..*/.so/'` ); \
45     done
46- @ldconfig
47 
48 else
49 
50@@ -180,10 +163,8 @@
51 
52 installstaticlib: static
53     @echo Installing static libraries in $(libdir).
54- @rm -f /usr/lib/libvga.a
55     @$(INSTALL_DATA) staticlib/libvga.a $(libdir)/libvga.a
56     @chmod a+r $(libdir)/libvga.a
57- @rm -f /usr/lib/libvgagl.a
58     @$(INSTALL_DATA) staticlib/libvgagl.a $(libdir)/libvgagl.a
59     @chmod a+r $(libdir)/libvgagl.a
60 
61@@ -192,14 +173,6 @@
62         echo No $(bindir) directory, creating it.; \
63         mkdir $(bindir); \
64     fi
65- @if [ -f /usr/bin/restorefont ]; then \
66- echo Removing old utilities in /usr/bin.; \
67- for x in $(UTILS); do rm -f /usr/bin/$$x; done; \
68- fi
69- @if [ -f /usr/bin/convfont ]; then \
70- echo Removing inappropriate utilities in /usr/bin.; \
71- rm -f /usr/bin/convfont /usr/bin/setmclk; \
72- fi
73     @echo Installing textmode utilities in $(bindir):
74     @echo "restorefont: Save/restore textmode font."
75     @cp utils/restorefont $(bindir)
76@@ -225,22 +198,6 @@
77         mkdir $(datadir); \
78         chmod go-w $(datadir); \
79     fi
80- @if [ \( -f /usr/local/lib/libvga.config -a ! -f $(datadir)/libvga.config \) ]; then \
81- echo "Moving old config file /usr/local/lib/libvga.config to $(datadir)." ; \
82- mv -f /usr/local/lib/libvga.config $(datadir)/libvga.config; \
83- fi
84- @if [ \( -f /usr/local/lib/libvga.et4000 -a ! -f $(datadir)/libvga.et4000 \) ]; then \
85- echo "Moving old config file /usr/local/lib/libvga.et4000 to $(datadir)." ; \
86- mv -f /usr/local/lib/libvga.et4000 $(datadir)/libvga.et4000; \
87- fi
88- @if [ \( -f /usr/local/lib/libvga.ega -a ! -f $(datadir)/libvga.ega \) ]; then \
89- echo "Moving old config file /usr/local/lib/libvga.ega to $(datadir)." ; \
90- mv -f /usr/local/lib/libvga.ega $(datadir)/libvga.ega; \
91- fi
92- @if [ \( -f /etc/mach32.eeprom -a ! -f $(datadir)/mach32.eeprom \) ]; then \
93- echo Consider moving your /etc/mach32.eeprom file to $(datadir) ; \
94- echo and changing $(datadir)/libvga.config appropriately. ; \
95- fi
96     @if [ ! -f $(datadir)/libvga.config ]; then \
97         echo Installing default configuration file in $(datadir).; \
98         cp $(confdir)/libvga.config $(datadir)/libvga.config; \
99@@ -269,48 +226,6 @@
100     @echo demos/ and threedkit/.
101 
102 uninstall:
103- @echo "Removing textmode utilities..."
104- @for i in $(OBSOLETEBDIRS); do \
105- for prog in $(UTILS); do \
106- rm -f $$i$$prog ; \
107- done ; \
108- done
109- @echo "Removing shared library stubs (old & current)..."
110- @for i in $(OBSOLETELDIRS); do \
111- rm -f `echo /lib/libvga.so.$(VERSION) /lib/libvgagl.so.$(VERSION) \
112- $(OBSOLETELIBLINKS) /lib/libvga.sa /lib/libvgagl.sa \
113- | sed s?/lib/?$$i?g`; \
114- done
115-ifndef KEEPSHAREDLIBS
116- @echo "Removing shared library images (old & current)..."
117- @for i in $(OBSOLETELDIRS); do \
118- rm -f `echo $(OBSOLETESHAREDIMAGES) | sed s?/lib/?$$i?g`; \
119- done
120-endif
121-ifneq ($(INSTALLAOUTDIR), )
122- @echo "Removing shared a.out library stubs (old & current)..."
123- @for i in $(OBSOLETEAOUTDIRS); do \
124- rm -f `echo /lib/libvga.so.$(VERSION) /lib/libvgagl.so.$(VERSION) \
125- $(OBSOLETELIBLINKS) /lib/libvga.sa /lib/libvgagl.sa \
126- | sed s?/lib/?$$i?g`; \
127- done
128-ifndef KEEPSHAREDLIBS
129- @echo "Removing shared a.out library images (old & current)..."
130- @for i in $(OBSOLETEAOUTDIRS); do \
131- rm -f `echo $(OBSOLETESHAREDIMAGES) | sed s?/lib/?$$i?g`; \
132- done
133-endif
134-endif
135- @echo "Removing static libraries..."
136- @for i in $(OBSOLETELDIRS); do \
137- rm -f `echo /lib/libvga.a /lib/libvgagl.a | sed s?/lib/?$$i?g`; \
138- done
139- @echo "Removing header files..."
140- @for i in $(OBSOLETEHDIRS); do \
141- rm -f `echo $(OBSOLETEHEADERS) | sed s?/inc/?$$i?g`; \
142- done
143- (cd doc; $(MAKE) -f $(srcdir)/doc/Makefile srcdir="$(srcdir)" uninstall)
144-
145 
146 SHAREDDIRS0 = sharedlib/mouse sharedlib/keyboard sharedlib/ramdac \
147         sharedlib/clockchip sharedlib/joystick
148Index: svgalib-1.4.3/threeDKit/Makefile
149===================================================================
150--- svgalib-1.4.3.orig/threeDKit/Makefile 2011-01-06 13:52:48.000000000 +0100
151+++ svgalib-1.4.3/threeDKit/Makefile 2011-01-06 14:03:17.000000000 +0100
152@@ -39,13 +39,9 @@
153 
154 plane: planukit.o planinit.o $(OBJECTS) $(LVGADEP)
155     $(CC) $(LDFLAGS) -o plane planukit.o planinit.o $(OBJECTS) $(LIBS)
156- chown root plane
157- chmod u+s plane
158 
159 wrapdemo: wrapdemo.o $(OBJECTS) $(LVGADEP)
160     $(CC) $(CFLAGS) $(LDFLAGS) -o wrapdemo wrapdemo.c $(OBJECTS) $(LIBS)
161- chown root wrapdemo
162- chmod u+s wrapdemo
163 
164 .c.o:
165     $(CC) $(CFLAGS) -c -o $*.o $<
166Index: svgalib-1.4.3/demos/Makefile
167===================================================================
168--- svgalib-1.4.3.orig/demos/Makefile 2011-01-06 14:03:32.000000000 +0100
169+++ svgalib-1.4.3/demos/Makefile 2011-01-06 14:04:20.000000000 +0100
170@@ -44,21 +44,15 @@
171 
172 .c:
173     $(CC) $(CFLAGS) $(LDFLAGS) -o $* $*.c $(LIBS)
174- chown 0 $*
175- chmod 4755 $*
176 
177 rwpage: rwpage.pp
178     $(PC) -Rintel rwpage.pp
179 
180 testaccel: testaccel.c
181     $(CC) $(CFLAGS) $(LDFLAGS) -o testaccel testaccel.c $(LIBS) -lm
182- chown 0 testaccel
183- chmod 4755 testaccel
184 
185 accel: accel.c
186     $(CC) $(CFLAGS) $(LDFLAGS) -o accel accel.c $(LIBS) -lm
187- chown 0 accel
188- chmod 4755 accel
189 
190 clean: cleanbin
191     rm -f .depend *.o *~ *.bak
192

Archive Download this file

Branches:
backfire
master
release_2010-11-17
release_2010-12-14
release_2011-02-23
release_2011-05-28
release_2011-08-27
release_2011-11-13
release_2012-03-18
release_2012-04-09
release_2012-07-11
release_2012-10-11



interactive