3
0
Fork 0
forked from mirrors/nixpkgs

Trying to resolve bug CX-1

svn path=/nixpkgs/trunk/; revision=6383
This commit is contained in:
Mart Kolthof 2006-08-30 17:44:04 +00:00
parent 61391a8721
commit e3e3031d69

View file

@ -1,6 +1,6 @@
diff -urN cil.orig/Makefile.cil.in cil/Makefile.cil.in diff -urN cil.orig/Makefile.cil.in cil/Makefile.cil.in
--- cil.orig/Makefile.cil.in 2005-11-22 06:34:41.000000000 +0100 --- cil.orig/Makefile.cil.in 2005-11-22 06:34:41.000000000 +0100
+++ cil/Makefile.cil.in 2006-01-16 13:33:41.000000000 +0100 +++ cil/Makefile.cil.in 2006-08-30 19:39:53.000000000 +0200
@@ -78,6 +78,7 @@ @@ -78,6 +78,7 @@
canonicalize heap oneret partial simplemem simplify \ canonicalize heap oneret partial simplemem simplify \
dataslicing \ dataslicing \
@ -18,20 +18,21 @@ diff -urN cil.orig/Makefile.cil.in cil/Makefile.cil.in
libdir = @libdir@ libdir = @libdir@
pkglibdir = $(libdir)/cil pkglibdir = $(libdir)/cil
datadir = @datadir@ datadir = @datadir@
@@ -554,6 +557,10 @@ @@ -554,6 +557,11 @@
$(INSTALL_DATA) $(install_lib) $(DESTDIR)$(pkglibdir) $(INSTALL_DATA) $(install_lib) $(DESTDIR)$(pkglibdir)
$(INSTALL) -d $(DESTDIR)$(pkgdatadir) $(INSTALL) -d $(DESTDIR)$(pkgdatadir)
$(INSTALL_DATA) $(addprefix lib/, $(filter %.pm, $(DISTRIB_LIB))) $(DESTDIR)$(pkgdatadir) $(INSTALL_DATA) $(addprefix lib/, $(filter %.pm, $(DISTRIB_LIB))) $(DESTDIR)$(pkgdatadir)
+ $(INSTALL) -d $(bindir) + $(INSTALL) -d $(bindir)
+ $(INSTALL) -d $(objdir) + $(INSTALL) -d $(objdir)
+ $(INSTALL) bin/* $(bindir) + $(INSTALL) bin/* $(bindir)
+ $(INSTALL_DATA) lib/* $(bindir)
+ $(INSTALL) $(OBJDIR)/*.exe $(objdir) + $(INSTALL) $(OBJDIR)/*.exe $(objdir)
cil.spec: cil.spec.in cil.spec: cil.spec.in
./config.status $@ ./config.status $@
diff -urN cil.orig/src/ext/atermprinter.ml cil/src/ext/atermprinter.ml diff -urN cil.orig/src/ext/atermprinter.ml cil/src/ext/atermprinter.ml
--- cil.orig/src/ext/atermprinter.ml 1970-01-01 01:00:00.000000000 +0100 --- cil.orig/src/ext/atermprinter.ml 1970-01-01 01:00:00.000000000 +0100
+++ cil/src/ext/atermprinter.ml 2006-02-20 10:50:49.000000000 +0100 +++ cil/src/ext/atermprinter.ml 2006-08-30 06:33:13.000000000 +0200
@@ -0,0 +1,488 @@ @@ -0,0 +1,488 @@
+open Cil +open Cil
+open Pretty +open Pretty
@ -523,7 +524,7 @@ diff -urN cil.orig/src/ext/atermprinter.ml cil/src/ext/atermprinter.ml
+ } + }
diff -urN cil.orig/src/maincil.ml cil/src/maincil.ml diff -urN cil.orig/src/maincil.ml cil/src/maincil.ml
--- cil.orig/src/maincil.ml 2005-11-22 06:34:41.000000000 +0100 --- cil.orig/src/maincil.ml 2005-11-22 06:34:41.000000000 +0100
+++ cil/src/maincil.ml 2006-01-16 10:37:24.000000000 +0100 +++ cil/src/maincil.ml 2006-08-30 06:33:13.000000000 +0200
@@ -105,6 +105,7 @@ @@ -105,6 +105,7 @@
Simplemem.feature; Simplemem.feature;
Simplify.feature; Simplify.feature;