diff options
| author |  Tom Willemsen | 2013-02-15 15:37:42 +0100 |
|---|---|---|
| committer | Tom Willemsen | 2013-02-15 15:37:42 +0100 |
| commit | 934d02bcacaa5d0aef64a8edf7677f3b0c198666 (patch) | |
| tree | edfc842025b5f8569973567b44ad62aa662f548f /Makefile | |
| parent | 06ff316f7f3b098504a6342651a79017cfb80ae7 (diff) | |
| parent | ee34dfcc2c2fec53731b64afca03bb34dd80b2ba (diff) | |
| download | dotfiles-934d02bcacaa5d0aef64a8edf7677f3b0c198666.tar.gz dotfiles-934d02bcacaa5d0aef64a8edf7677f3b0c198666.zip | |
Merge remote-tracking branch 'ryuslash/master' into phoenix
Conflicts:
.config/awesome/rc.lua
.emacs.d/init.el
.emacs.d/init.org
.emacs.d/site-lisp/oni.el
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -1,10 +1,12 @@ export DESTDIR:=$(HOME) modules=.emacs.d .config .conkerorrc .local .moc .mutt .ncmpcpp \ - .pentadactyl .sawfish .ssh .w3m .weechat .zsh + .pentadactyl .sawfish .ssh .w3m .weechat .zsh xmonad objects=.bash_profile .beetsconfig .conky_box.lua .conkyrc .gitconfig \ .guile .hgrc .offlineimap.py .offlineimaprc .screenrc .scwmrc \ .slrnrc .stumpwmrc .tmux.conf .urlview .xbindkeysrc.scm .Xdefaults \ - .xinitrc .Xmodmap .xsession .zprofile .zshrc + .xinitrc .Xmodmap .xsession .zprofile .zshrc .zile + +export MAKEROOT=y include dotfiles.mk |