Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorDan Winship <dwinship@redhat.com>2007-09-20 16:21:31 (GMT)
committer Dan Winship <dwinship@redhat.com>2007-09-20 16:21:31 (GMT)
commit741a424166b1ef4d6046ea543205d3992c21579f (patch)
tree63316aba386d9163ffbd831500b389c48be9676a /services
parentf377d6e5197f07b82c3ccd29e2899e02f03b3d8e (diff)
parent5a595ea04ea485a2c58b99acbda1621971d2ebb5 (diff)
Merge branch 'master' of git+ssh://danw@dev.laptop.org/git/sugar
Diffstat (limited to 'services')
-rw-r--r--services/console/interface/Makefile.am2
-rw-r--r--services/console/lib/Makefile.am2
2 files changed, 2 insertions, 2 deletions
diff --git a/services/console/interface/Makefile.am b/services/console/interface/Makefile.am
index ef0f3e4..bd63b56 100644
--- a/services/console/interface/Makefile.am
+++ b/services/console/interface/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = memphis network logviewer terminal xo
+SUBDIRS = memphis network logviewer terminal xo xserver
sugardir = $(pkgdatadir)/services/console/interface
sugar_PYTHON = \
diff --git a/services/console/lib/Makefile.am b/services/console/lib/Makefile.am
index 238c435..c48a0c1 100644
--- a/services/console/lib/Makefile.am
+++ b/services/console/lib/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = procmem graphics net ui
-sugardir = $(pkgdatadir)/shell/console/lib
+sugardir = $(pkgdatadir)/services/console/lib
sugar_PYTHON = \
pyxres.py