diff options
| author | Changyeon Lee <cyeon.lee@samsung.com> | 2014-04-17 14:39:58 +0900 |
|---|---|---|
| committer | Changyeon Lee <cyeon.lee@samsung.com> | 2014-04-17 14:46:41 +0900 |
| commit | ba6c5bef58d88aab1584107543b81a2930451a1f (patch) | |
| tree | aa0e1ab02744850352e42ecbd629ad5a8f5c98d8 /launchd/Makefile.am | |
| parent | d7fbb5c11b41bb71b9173daea2f48d855bc61316 (diff) | |
| parent | 8d5e38de0819168970669f24379c21338616184e (diff) | |
| download | xinit-ba6c5bef58d88aab1584107543b81a2930451a1f.tar.gz xinit-ba6c5bef58d88aab1584107543b81a2930451a1f.tar.bz2 xinit-ba6c5bef58d88aab1584107543b81a2930451a1f.zip | |
Merge branch 'devel/upgrade' into tizentizen_3.0.2014.q3_common_releasesubmit/tizen_mobile/20141120.000000submit/tizen/20140819.234625submit/tizen/20140818.144456submit/tizen/20140818.084211submit/tizen/20140417.073530submit/devel/x11/20140718.035926accepted/tizen/mobile/20140519.083048tizen_3.0.2015.q2_commontizen_3.0.2015.q1_commontizen_3.0.2014.q4_commontizen_3.0.2014.q3_commondevel/x11accepted/tizen_wearableaccepted/tizen_tvaccepted/tizen_mobileaccepted/tizen_commonaccepted/tizen_3.0.2014.q3_common
Change-Id: Ibe6f53547397a2beaf4747ef8a442b43e41544fb
Signed-off-by: Changyeon Lee <cyeon.lee@samsung.com>
Diffstat (limited to 'launchd/Makefile.am')
| -rw-r--r-- | launchd/Makefile.am | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/launchd/Makefile.am b/launchd/Makefile.am index f8781ed..0135b7f 100644 --- a/launchd/Makefile.am +++ b/launchd/Makefile.am @@ -1,3 +1,8 @@ -SUBDIRS = privileged_startx user_startx +DIST_SUBDIRS = privileged_startx user_startx +SUBDIRS = privileged_startx + +if !TIGER_LAUNCHD +SUBDIRS += user_startx +endif EXTRA_DIST = console_redirect.h |