Magellan Linux

Diff of /trunk/libtommath/patches/libtommath-0.42.0-build-fixes.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1316 by niro, Fri May 6 18:19:57 2011 UTC revision 1317 by niro, Fri May 6 18:25:38 2011 UTC
# Line 1  Line 1 
1  diff -Naur libtommath-0.42.0/makefile.shared libtommath-0.42.0-magellan/makefile.shared  diff -Naur libtommath-0.42.0/makefile.shared libtommath-0.42.0-magellan/makefile.shared
2  --- libtommath-0.42.0/makefile.shared 2010-07-23 16:27:20.000000000 +0200  --- libtommath-0.42.0/makefile.shared 2010-07-23 16:27:20.000000000 +0200
3  +++ libtommath-0.42.0-magellan/makefile.shared 2011-05-06 19:41:29.000000000 +0200  +++ libtommath-0.42.0-magellan/makefile.shared 2011-05-06 19:52:47.000000000 +0200
4  @@ -3,7 +3,7 @@  @@ -3,7 +3,7 @@
5   #Tom St Denis   #Tom St Denis
6   VERSION=0:41   VERSION=0:41
# Line 10  diff -Naur libtommath-0.42.0/makefile.sh Line 10  diff -Naur libtommath-0.42.0/makefile.sh
10    
11   CFLAGS  +=  -I./ -Wall -W -Wshadow -Wsign-compare   CFLAGS  +=  -I./ -Wall -W -Wshadow -Wsign-compare
12    
13  @@ -82,21 +82,24 @@  @@ -20,19 +20,6 @@
14    
15     endif
16    
17    -#install as this user
18    -ifndef INSTALL_GROUP
19    -   GROUP=wheel
20    -else
21    -   GROUP=$(INSTALL_GROUP)
22    -endif
23    -
24    -ifndef INSTALL_USER
25    -   USER=root
26    -else
27    -   USER=$(INSTALL_USER)
28    -endif
29    -
30     default: libtommath.la
31    
32     #default files to install
33    @@ -82,21 +69,24 @@
34    
35   objs: $(OBJECTS)   objs: $(OBJECTS)
36    
# Line 22  diff -Naur libtommath-0.42.0/makefile.sh Line 42  diff -Naur libtommath-0.42.0/makefile.sh
42  + libtool --mode=link --tag=CC $(CC) $(LDFLAGS) *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)  + libtool --mode=link --tag=CC $(CC) $(LDFLAGS) *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)
43    
44   install: $(LIBNAME)   install: $(LIBNAME)
45   install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH)  - install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH)
46    + install -d $(DESTDIR)$(LIBPATH)
47   libtool --mode=install install -c $(LIBNAME) $(DESTDIR)$(LIBPATH)/$(LIBNAME)   libtool --mode=install install -c $(LIBNAME) $(DESTDIR)$(LIBPATH)/$(LIBNAME)
48   install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(INCPATH)  - install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(INCPATH)
49  - install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH)  - install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH)
50  + install -m 644 -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH)  + install -d $(DESTDIR)$(INCPATH)
51    + install -m 644 $(HEADERS) $(DESTDIR)$(INCPATH)
52    
53   test: $(LIBNAME) demo/demo.o   test: $(LIBNAME) demo/demo.o
54  - gcc $(CFLAGS) -c demo/demo.c -o demo/demo.o  - gcc $(CFLAGS) -c demo/demo.c -o demo/demo.o

Legend:
Removed from v.1316  
changed lines
  Added in v.1317