diff options
| author | Dana Jansens <danakj@orodu.net> | 2007-05-10 03:12:44 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2007-05-10 03:12:44 +0000 |
| commit | 7d27d9d398b92e73aa47dd37e4418166c03bf0ca (patch) | |
| tree | 4a908b769720570a5826a4ac72be0746846ad7a5 /Makefile.am | |
| parent | f1ad68d05bf22bec99f8e1a749fc86bfe16df5af (diff) | |
kill the .in's for xml. we're not installing the xsd to the filesystem anymore anyways.
kill the openbox-kde and openbox-gnome, we're going to have to do it different.
put the full path to the openbox binary in the openbox-*-session files by using .in's
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 35ccca9c..95b017a4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,9 +32,7 @@ bin_PROGRAMS = \ bin_SCRIPTS = \ data/xsession/openbox-gnome-session \ - data/xsession/openbox-kde-session \ - data/xsession/openbox-gnome \ - data/xsession/openbox-kde + data/xsession/openbox-kde-session noinst_PROGRAMS = \ tools/themetoxml/themetoxml @@ -377,19 +375,23 @@ nodist_rc_DATA = \ edit = $(SED) \ -e 's!@version\@!$(VERSION)!' \ - -e 's!@xsddir\@!$(xsddir)!' + -e 's!@bindir\@!$(bindir)!' -data/rc.xml: Makefile $(srcdir)/data/rc.xml.in data +data/xsession/openbox-gnome-session: Makefile data \ + $(srcdir)/data/xsession/openbox-gnome-session.in @echo make: creating $@ @rm -f $@ @mkdir data 2>/dev/null || true - @$(edit) $(srcdir)/data/rc.xml.in >$@ + @$(edit) $(srcdir)/data/xsession/openbox-gnome-session.in >$@ + @chmod +x $@ -data/menu.xml: Makefile $(srcdir)/data/menu.xml.in data +data/xsession/openbox-kde-session: Makefile data \ + $(srcdir)/data/xsession/openbox-kde-session.in @echo make: creating $@ @rm -f $@ @mkdir data 2>/dev/null || true - @$(edit) $(srcdir)/data/menu.xml.in >$@ + @$(edit) $(srcdir)/data/xsession/openbox-kde-session.in >$@ + @chmod +x $@ dist_gnomewmfiles_DATA = \ data/gnome-wm-properties/openbox.desktop \ @@ -406,8 +408,8 @@ dist_noinst_DATA = \ data/rc.xsd \ data/menu.xsd \ data/themerc.xsd \ - data/rc.xml.in \ - data/menu.xml.in \ + data/xsession/openbox-gnome-session.in \ + data/xsession/openbox-kde-session.in \ render/obrender-3.0.pc.in \ parser/obparser-3.0.pc.in \ tools/themeupdate/themeupdate.py \ |