From 741a424166b1ef4d6046ea543205d3992c21579f Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Thu, 20 Sep 2007 16:21:31 +0000 Subject: Merge branch 'master' of git+ssh://danw@dev.laptop.org/git/sugar --- (limited to 'services') 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 -- cgit v0.9.1