diff options
| -rw-r--r-- | altosui/Makefile-standalone | 2 | ||||
| -rw-r--r-- | altosui/Makefile.am | 2 | ||||
| -rw-r--r-- | altosui/altos-windows.nsi.in | 10 | ||||
| -rwxr-xr-x | altusmetrum.inf (renamed from telemetrum.inf) | 0 | ||||
| -rw-r--r-- | telegps/Makefile.am | 2 | ||||
| -rw-r--r-- | telegps/telegps-windows.nsi.in | 8 |
6 files changed, 12 insertions, 12 deletions
diff --git a/altosui/Makefile-standalone b/altosui/Makefile-standalone index 23163e40..cbaf9743 100644 --- a/altosui/Makefile-standalone +++ b/altosui/Makefile-standalone @@ -181,7 +181,7 @@ $(DARWIN_ZIP): $(DARWIN_FILES) cp $(DARWIN_EXTRA) darwin/AltOS cd darwin && zip -r ../$@ AltosUI.app AltOS -WINDOWS_FILES = $(FAT_FILES) libaltos/altos.dll ../telemetrum.inf $(WINDOWS_ICON) +WINDOWS_FILES = $(FAT_FILES) libaltos/altos.dll ../altusmetrum.inf $(WINDOWS_ICON) $(WINDOWS_EXE): $(WINDOWS_FILES) altos-windows.nsi rm -f $@ diff --git a/altosui/Makefile.am b/altosui/Makefile.am index 0300513e..ddeb8ea3 100644 --- a/altosui/Makefile.am +++ b/altosui/Makefile.am @@ -144,7 +144,7 @@ MACOSX_INFO_PLIST=Info.plist MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(DOC) ReadMe-Mac.rtf $(MACOSX_ICON) MACOSX_EXTRA=$(FIRMWARE) -WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON) +WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/altusmetrum.inf $(WINDOWS_ICON) all-local: classes/altosui $(JAR) altosui altosui-test altosui-jdb diff --git a/altosui/altos-windows.nsi.in b/altosui/altos-windows.nsi.in index 3832e901..e50e1447 100644 --- a/altosui/altos-windows.nsi.in +++ b/altosui/altos-windows.nsi.in @@ -71,14 +71,14 @@ Section "Install Driver" InstDriver InstDrv::CreateDevice /NOUNLOAD SetOutPath $TEMP - File "../telemetrum.inf" - InstDrv::InstallDriver /NOUNLOAD "$TEMP\telemetrum.inf" + File "../altusmetrum.inf" + InstDrv::InstallDriver /NOUNLOAD "$TEMP\altusmetrum.inf" SetOutPath $INSTDIR - File "../telemetrum.inf" + File "../altusmetrum.inf" SetOutPath $WINDIR\Inf - File "../telemetrum.inf" + File "../altusmetrum.inf" SectionEnd @@ -165,7 +165,7 @@ Section "Uninstall" RMDir "$INSTDIR" ; Remove .inf file - Delete "$WINDIR\Inf\telemetrum.inf" + Delete "$WINDIR\Inf\altusmetrum.inf" ; Remove devices InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} AltusMetrumSerial diff --git a/telemetrum.inf b/altusmetrum.inf index 220069b3..220069b3 100755 --- a/telemetrum.inf +++ b/altusmetrum.inf diff --git a/telegps/Makefile.am b/telegps/Makefile.am index 5812756f..99c2fb4a 100644 --- a/telegps/Makefile.am +++ b/telegps/Makefile.am @@ -128,7 +128,7 @@ MACOSX_README=ReadMe-Mac.rtf MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_README) $(DOC) $(MACOSX_ICON) MACOSX_EXTRA=$(FIRMWARE) -WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(DOC) $(WINDOWS_ICON) +WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/altusmetrum.inf $(DOC) $(WINDOWS_ICON) if FATINSTALL diff --git a/telegps/telegps-windows.nsi.in b/telegps/telegps-windows.nsi.in index 92b50974..136d68fb 100644 --- a/telegps/telegps-windows.nsi.in +++ b/telegps/telegps-windows.nsi.in @@ -71,14 +71,14 @@ Section "Install Driver" InstDriver InstDrv::CreateDevice /NOUNLOAD SetOutPath $TEMP - File "../telemetrum.inf" - InstDrv::InstallDriver /NOUNLOAD "$TEMP\telemetrum.inf" + File "../altusmetrum.inf" + InstDrv::InstallDriver /NOUNLOAD "$TEMP\altusmetrum.inf" SetOutPath $INSTDIR - File "../telemetrum.inf" + File "../altusmetrum.inf" SetOutPath $WINDIR\Inf - File "../telemetrum.inf" + File "../altusmetrum.inf" SectionEnd |