Fix directory name after FRON-58.

Author: Stan Skowronek

Makefile.am

@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = src tools
+SUBDIRS = usbfluxd tools
 
 EXTRA_DIST = COPYING.GPLv2 COPYING.GPLv3
 

USBFlux/USBFlux.xcodeproj/project.pbxproj

@@ -30,7 +30,7 @@
 		0430E93E20BEF9F10047F28C /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		0430E94020BEF9F10047F28C /* USBFlux.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = USBFlux.entitlements; sourceTree = "<group>"; };
 		0430E95120C00CA30047F28C /* AuthIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AuthIcon.png; sourceTree = "<group>"; };
-		0430E95320C02E5B0047F28C /* usbfluxd */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = usbfluxd; path = ../src/usbfluxd; sourceTree = "<group>"; };
+		0430E95320C02E5B0047F28C /* usbfluxd */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = usbfluxd; path = ../usbfluxd/usbfluxd; sourceTree = "<group>"; };
 		047357A320DB2A9F0089445A /* terminate.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = terminate.sh; path = USBFlux/terminate.sh; sourceTree = "<group>"; };
 		04D7270A215BD74000B29E2E /* Corellium.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Corellium.h; sourceTree = "<group>"; };
 		04D7270B215BD74000B29E2E /* Corellium.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Corellium.m; sourceTree = "<group>"; };

build-gui.sh

@@ -7,7 +7,7 @@ if test -n $CONFIG_VERSION; then
 fi
 
 make
-codesign -s "Developer ID Application: Corellium LLC (XG264R6QP8)" src/usbfluxd
+codesign -s "Developer ID Application: Corellium LLC (XG264R6QP8)" usbfluxd/usbfluxd
 codesign -s "Developer ID Application: Corellium LLC (XG264R6QP8)" tools/usbfluxctl
 
 COMMIT=`git rev-parse HEAD`

configure.ac

@@ -5,7 +5,7 @@ AC_PREREQ(2.64)
 AC_INIT([usbfluxd], [1.2.0], [https://corellium.com],, [https://corellium.com])
 AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip check-news])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
-AC_CONFIG_SRCDIR([src/])
+AC_CONFIG_SRCDIR([usbfluxd/])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -91,7 +91,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 AC_OUTPUT([
 Makefile
-src/Makefile
+usbfluxd/Makefile
 tools/Makefile
 ])
 

makedmg.sh

@@ -11,7 +11,7 @@ BUILDDIR="USBFlux/build/Release"
 # build the daemon
 make clean && make
 # sign it
-codesign -s "Developer ID Application: Corellium LLC (XG264R6QP8)" src/usbfluxd
+codesign -s "Developer ID Application: Corellium LLC (XG264R6QP8)" usbfluxd/usbfluxd
 
 COMMIT=`git rev-parse HEAD`
 if test -z $COMMIT; then