diff options
| author | Mikael Magnusson <mikachu@comhem.se> | 2008-02-28 06:20:50 +0100 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@comhem.se> | 2008-02-28 06:20:50 +0100 |
| commit | 163950b23bf796a39870044417ca54d667b6b470 (patch) | |
| tree | d6b2a668aa738a3dd0a6e1f38524211e2b45d3b8 /Makefile.am | |
| parent | f857b0eb99471c9123d6e641afafeab5f47700e2 (diff) | |
| parent | 573bbb08a63d2f1c1cb873a0746613cfb6fdb560 (diff) | |
Merge branch 'backport' into work
Conflicts:
Makefile.am
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index ec6157b2..6e8cb232 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,7 +33,7 @@ bin_PROGRAMS = \ openbox/openbox \ tools/gnome-panel-control/gnome-panel-control -secretbin_SCRIPTS = \ +dist_secretbin_SCRIPTS = \ tools/xdg-autostart/xdg-autostart nodist_bin_SCRIPTS = \ @@ -417,8 +417,10 @@ nodist_pkgconfig_DATA = \ dist_pixmap_DATA = \ data/openbox.png +nodist_rc_DATA = \ + data/autostart.sh + dist_rc_DATA = \ - data/autostart.sh \ data/rc.xml \ data/menu.xml @@ -457,6 +459,7 @@ nodist_xsessions_DATA = \ data/xsession/openbox-kde.desktop dist_noinst_DATA = \ + data/autostart.sh.in \ data/rc.xsd \ data/menu.xsd \ data/xsession/openbox.desktop.in \ |