Merge branch 'master' of github.com:pisilinux/main

This commit is contained in:
alihanozturk
2017-01-26 12:31:36 +03:00
3 changed files with 5 additions and 2 deletions
+3
View File
@@ -26,6 +26,8 @@
<Dependency>iso-codes</Dependency> <Dependency>iso-codes</Dependency>
<Dependency>libxslt</Dependency> <Dependency>libxslt</Dependency>
<Dependency>gtk-doc</Dependency> <Dependency>gtk-doc</Dependency>
<Dependency>nodejs</Dependency>
<Dependency>json-glib-devel</Dependency>
<Dependency>gobject-introspection-devel</Dependency> <Dependency>gobject-introspection-devel</Dependency>
<Dependency>docbook-xsl</Dependency> <Dependency>docbook-xsl</Dependency>
</BuildDependencies> </BuildDependencies>
@@ -40,6 +42,7 @@
<Dependency>gtk2</Dependency> <Dependency>gtk2</Dependency>
<Dependency>gtk3</Dependency> <Dependency>gtk3</Dependency>
<Dependency>cairo</Dependency> <Dependency>cairo</Dependency>
<Dependency>json-glib</Dependency>
<!--Dependency>gconf</Dependency--> <!--Dependency>gconf</Dependency-->
<Dependency>libXi</Dependency> <Dependency>libXi</Dependency>
<Dependency>pango</Dependency> <Dependency>pango</Dependency>
+1 -1
View File
@@ -7,7 +7,7 @@ from pisi.actionsapi import cmaketools
from pisi.actionsapi import get from pisi.actionsapi import get
from pisi.actionsapi import shelltools from pisi.actionsapi import shelltools
WorkDir = "pugixml-1.7/scripts" #WorkDir = "pugixml-1.8/scripts"
def setup(): def setup():
cmaketools.configure("-DCMAKE_INSTALL_LIBDIR=lib \ cmaketools.configure("-DCMAKE_INSTALL_LIBDIR=lib \
+1 -1
View File
@@ -21,4 +21,4 @@ def check():
def install(): def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR()) autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.dodoc("ChangeLog", "CREDITS", "NEWS", "README", "README-linux",) pisitools.dodoc("ChangeLog", "CREDITS", "NEWS", "README", "README-linux-ptrace",)