JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
fixed race condition in "make install"
authorJason Woofenden <jason283@herkamire.com>
Thu, 28 May 2009 00:36:36 +0000 (20:36 -0400)
committerJason Woofenden <jason283@herkamire.com>
Thu, 28 May 2009 02:59:13 +0000 (22:59 -0400)
Makefile

index 8fd1161..8b93708 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -112,7 +112,7 @@ data-clean:
 mkinstalldirs:
        if [ ! -d $(DESTDIR)$(pkgdatadir) ]; then mkdir $(DESTDIR)$(pkgdatadir); fi
 
-rminstalldirs:
+rminstalldirs: uninstall-data
        if [ -d $(DESTDIR)$(pkgdatadir) ]; then rmdir $(DESTDIR)$(pkgdatadir); fi
 
 install: all mkinstalldirs install-program install-data
@@ -120,7 +120,7 @@ install: all mkinstalldirs install-program install-data
 install-program: program
        $(INSTALL_PROGRAM) ./vor $(DESTDIR)$(bindir)
 
-install-data: data
+install-data: data mkinstalldirs
        $(INSTALL_DATA) ./data/*.png $(DESTDIR)$(pkgdatadir)/
        $(INSTALL_DATA) ./data/*.wav $(DESTDIR)$(pkgdatadir)/
        $(INSTALL_DATA) ./data/*.xm $(DESTDIR)$(pkgdatadir)/